Adds Attribute support