Added enums for grouping