Fixed all api calls