Refactored both the Request and Response objects