v1.2 Added tracking of AttributeSets