Some updates to the routing system