RoutesCollection refactor