Refactored OpenGroup