Updated Router service wiring for injectability