Adding support for groups