Work on Cluster class