added a number of fields to Attribute
remove extra code duplication
version bump