Changed all cluster maps to new ClusterMap type.