* Replaced every occurrance of AttributeType with AttributeDescriptor - I think it saves a lot of typing...