Add support for attribute groups