Galaxy Clusters in the Presence of Substructure