Changes to Route object for more intuitive matching