Added support for groups and group memberships