Update to request and response