Make the response object more consistant