Updated the router to use the Request class exclusively