Added baseUrl to api calls