Update route handling code
0.2.3