Adding  nav model capability and cleaning up the API of the router.