Add support for groups