More group refactoring