Improved route handling