Added some DI in the Router