Added Attribute class
Added Attribute class
Merged