WHISTLE-1861: refine the concept of groups and incorporate with ring/page groups