Moved more API calls to services.js