Switched to using Cloud Endpoints