Feature/return missing fields

createEmptyCluster is a bit confusing since the cluster object will be eventually used to create a real cluster.