v1.2 Added tracking/untracking of AttributeSets