Added support for managing attribute sets