Routing/dispatching refactoring.