Managed empty responses from APIs
Cleaned up the API