Added more support for groups