Improve excludedGroups usage