Improves route handling in Router