Updated Cluster class