added initial support for groups