Fixing router and request class