Improve API calls for users