Fixes and updates to the API return data struct