Making some changes to the response format.