Improve route generation.