Updated Request and Router classes for better routing