Improve route management