Refactoring API calls
Refactoring API calls
Refactoring API calls
Merge from develop
Merge from develop