Reworking route handling