Add Router as replacement for ServiceResolver