Minor changes to Request and Response