Added group and group memberships