[HELIX-18] Added more functionality to the new cluster setup