Improve the ClusterAware interfaces.