Reworked route handling