Optimized api calls
Merge branch 'develop'