upgrades to attribute handling