1 files changed, 16 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java b/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java
index 795ec9badbb..813be5ef0da 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/ImmutableSearch.java
@@ -1,9 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.searchdefinition;
 
+import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.searchdefinition.document.ImmutableSDField;
+import com.yahoo.searchdefinition.document.SDField;
 import com.yahoo.vespa.documentmodel.SummaryField;
 
+import java.io.Reader;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -15,11 +19,22 @@ import java.util.stream.Stream;
  */
 public interface ImmutableSearch {
 
+    String getName();
+    Index getIndex(String name);
+    SDField getConcreteField(String name);
+    List<SDField> allConcreteFields();
+    List<Index> getExplicitIndices();
+    Reader getRankingExpression(String fileName);
+    ApplicationPackage applicationPackage();
+    RankingConstants rankingConstants();
     Stream<ImmutableSDField> allImportedFields();
 
     ImmutableSDField getField(String name);
 
-    Stream<ImmutableSDField> allFields();
+    default Stream<ImmutableSDField> allFields() {
+        return allFieldsList().stream();
+    }
+    List<ImmutableSDField> allFieldsList();
 
     Map<String, SummaryField> getSummaryFields(ImmutableSDField field);
 }