updated attribute handling