1 files changed, 9 insertions, 6 deletions
diff --git a/indexinglanguage/src/main/javacc/IndexingParser.jj b/indexinglanguage/src/main/javacc/IndexingParser.jj
index e6b21f7c07b..51bb9be1f8a 100644
--- a/indexinglanguage/src/main/javacc/IndexingParser.jj
+++ b/indexinglanguage/src/main/javacc/IndexingParser.jj
@@ -45,7 +45,7 @@ public class IndexingParser {
 
     private String defaultFieldName;
     private Linguistics linguistics;
-    private Embedder embedder;
+    private Map<String, Embedder> embedders;
     private AnnotatorConfig annotatorCfg;
 
     public IndexingParser(String str) {
@@ -62,8 +62,8 @@ public class IndexingParser {
         return this;
     }
 
-    public IndexingParser setEmbedder(Embedder embedder) {
-        this.embedder = embedder;
+    public IndexingParser setEmbedders(Map<String, Embedder> embedders) {
+        this.embedders = embedders;
         return this;
     }
 
@@ -367,10 +367,13 @@ Expression echoExp() : { }
     { return new EchoExpression(); }
 }
 
-Expression embedExp() : { }
+Expression embedExp() :
 {
-    ( <EMBED> )
-    { return new EmbedExpression(embedder); }
+    String val = "";
+}
+{
+    ( <EMBED> [ LOOKAHEAD(2) val = identifier() ] )
+    { return new EmbedExpression(embedders, val); }
 }
 
 Expression exactExp() : { }