Routing models fixes