Making some of the request/response data types more consistent