Refactored - single addAll for routes