Refactored init and group references