Revamps the API calls