Unified grouping types