Adding ClusterManager support