Add more columns to match_entry
Add route_info structure