Better route management