Updated 2.0 attribute parser to match 1.0 changes