Tracking ToT changes to Attribute API