Refactored GroupAddress