CLSN-2124 : moved api calls to other api calls