Refactoring Group admission