Update Router class to match new DispatcherInterface
Add convenience methods to Router

Code cleanup and inspection