Add multi group with buckets for Waratek applications