Prior to changing internal response structure
started response restruct