Several updates relating Routing v2