update to attribute handling