First step towards decoupling router from service.