Updated route handling