Refactoring API calls
Move methods from top to api_connector