Some refactoring for subgroups.