Refactored Dispatcher/Router Relationship.