Commit of new architecture to deal with multiple.membership.groups