Can we wait for the follow up refactoring that cleans up all these group-related classes?