OZP-244 Added group container logic