Added more changes to api calls