Fixed the API calls to be more scalable
Small change in interface