CORE-423 changes for response and request structure