Updated feature: Amended routing