Simplified attribute list handling; Test OK