Change to api call names and getting rid of unnecessary manager