Continue refactoring Request. Also, fix ControllerDispatcher