Added interfaces for ClusterNodes plus other changes