More refactoring for subgroups.