Add Groups. Refactoring