Fixes Request and Response for API