+ Refactoring of AttributeValue* -> Value*