Code refactoring (Introduce new RoutesHelper)