Updated attribute names