updates to Attribute handling