Enhanced routing