Working on cluster endpoitn implementation