Improves Cluster implementation.