Improved calls to the API