Add support for attributes in groups