Support for custom group attributes #659