Update for routing performance
Update for routing performance