Updated the format of the returned JSON to work better with the consuming mobile application