1 files changed, 2 insertions, 4 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
index 5ee73abc28d..5bcfa841bae 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java
@@ -121,10 +121,8 @@ class ParsedField extends ParsedBlock {
     void setStemming(Stemming stemming) { this.stemming = stemming; }
     void setWeight(int weight) { this.weight = weight; }
 
-    void addAttribute(ParsedAttribute attribute) {
-        String attrName = attribute.name();
-        verifyThat(! attributes.containsKey(attrName), "already has attribute", attrName);
-        attributes.put(attrName, attribute);
+    ParsedAttribute attributeFor(String attrName) {
+        return attributes.computeIfAbsent(attrName, n -> new ParsedAttribute(n));
     }
 
     void setIndexingOperation(ParsedIndexingOp idxOp) {