More updates for routing.