Modify the request-handler