Better route handling