Better route handing