Updated response object definition to be more modular.