OZP-91: Update Group Gateway Implementation