Refactoring to allow embed cluster calling ClusterImpl.getInstance()