Updated attribute processing code.