Updated to support the new ClusterManager interface