Updates to cluster implementation