Update modeling of group membership to be more queryable.