Refactor to the request / response model