Add Attribute model
Correct Uniform names