Updated URL routing