Update route handling
0.51.1