+ Changes due to refactoring of AttributeValue* -> Value*