Made Router into a PartialDispatcher