Added some some stuff to Cluster class