diff --git a/dbflute_fess/dfprop/esfluteMap.dfprop b/dbflute_fess/dfprop/esfluteMap.dfprop
index 9bf49665a9e548fc243e0671bcb7b85251d8fbbe..3921a80c4dcd0f54eb900fe448e9b37baee9e624 100644
--- a/dbflute_fess/dfprop/esfluteMap.dfprop
+++ b/dbflute_fess/dfprop/esfluteMap.dfprop
@@ -31,5 +31,5 @@ map:{
             }
         }
     }
-    ; elasticsearchVersion = 2.3.3
+    ; elasticsearchVersion = 5.0.2
 }
diff --git a/plugin.xml b/plugin.xml
index 2c659d5e9d0b40c28759d909f3eddca3c582d104..aa0c9aceb617a82425d94556b590ddaa0e52d83b 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -13,72 +13,58 @@
 		<mkdir dir="${plugins.dir}" />
 		<!-- analysis-fess -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-fess" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.133315-1" />
 		</antcall>
 		<!-- analysis-ja -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-ja" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.132732-1" />
 		</antcall>
 		<!-- analysis-synonym -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="analysis-synonym" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.131354-1" />
 		</antcall>
 		<!-- configsync -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="configsync" />
-			<param name="plugin.version" value="2.4.2" />
-			<param name="plugin.zip.version" value="2.4.2" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161222.140933-3" />
 		</antcall>
 		<!-- dataformat -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="dataformat" />
-			<param name="plugin.version" value="2.4.0" />
-			<param name="plugin.zip.version" value="2.4.0" />
-		</antcall>
-		<!-- groovy -->
-		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
-			<param name="plugin.groupId" value="org/elasticsearch/module" />
-			<param name="plugin.name.prefix" value="" />
-			<param name="plugin.name" value="lang-groovy" />
-			<param name="plugin.version" value="${elasticsearch.version}" />
-			<param name="plugin.zip.version" value="${elasticsearch.version}" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161222.135233-2" />
 		</antcall>
 		<!-- langfield -->
 		<antcall target="install.plugin">
-			<param name="repo.url" value="${maven.release.repo.url}" />
+			<param name="repo.url" value="${maven.snapshot.repo.url}" />
 			<param name="plugin.groupId" value="org/codelibs" />
 			<param name="plugin.name.prefix" value="elasticsearch-" />
 			<param name="plugin.name" value="langfield" />
-			<param name="plugin.version" value="2.4.1" />
-			<param name="plugin.zip.version" value="2.4.1" />
+			<param name="plugin.version" value="5.0.0-SNAPSHOT" />
+			<param name="plugin.zip.version" value="5.0.0-20161215.132043-1" />
 		</antcall>
-		<!-- kopf -->
-		<get dest="${target.dir}">
-			<url url="http://maven.codelibs.org/archive/elasticsearch/plugin/kopf/elasticsearch-kopf-2.0.1.0.zip" />
-		</get>
-		<unzip dest="${plugins.dir}/kopf" src="${target.dir}/elasticsearch-kopf-2.0.1.0.zip" />
 
 		<antcall target="remove.jars" />
 	</target>
@@ -93,11 +79,16 @@
 	<target name="remove.jars" if="with.fess">
 		<delete>
 			<fileset dir="${plugins.dir}">
+				<include name="configsync/commons-codec-*" />
+				<include name="dataformat/commons-codec-*" />
 				<include name="dataformat/curvesapi-*" />
+				<include name="dataformat/netty-*" />
+				<include name="dataformat/orangesignal-csv-*" />
 				<include name="dataformat/poi-*" />
-				<include name="dataformat/xmlbeans-*" />
 				<include name="dataformat/stax-api-*" />
-				<include name="lang-groovy/groovy-*" />
+				<include name="dataformat/transport-*" />
+				<include name="dataformat/xmlbeans-*" />
+				<include name="langfield/jackson-*" />
 			</fileset>
 		</delete>
 	</target>
diff --git a/pom.xml b/pom.xml
index 10e2e902784213810d1a45ec0818bf4405990c74..014b4353a4fd5ce80ed0cdbe448ec937c03e2501 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,14 +57,14 @@
 		<utflute.version>0.6.3</utflute.version>
 
 		<!-- Crawler -->
-		<crawler.version>1.0.12-SNAPSHOT</crawler.version>
+		<crawler.version>1.1.0-SNAPSHOT</crawler.version>
 
 		<!-- Suggest -->
-		<suggest.version>2.3.1</suggest.version>
+		<suggest.version>5.0.0-SNAPSHOT</suggest.version>
 
 		<!-- Elasticsearch -->
-		<elasticsearch.version>2.4.2</elasticsearch.version>
-		<cluster.runner.version>2.4.0.0</cluster.runner.version>
+		<elasticsearch.version>5.0.2</elasticsearch.version>
+		<cluster.runner.version>5.0.2.0-SNAPSHOT</cluster.runner.version>
 
 		<!-- Tomcat -->
 		<tomcat.version>8.5.5</tomcat.version>
@@ -1061,14 +1061,49 @@
 			<artifactId>elasticsearch</artifactId>
 			<version>${elasticsearch.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.elasticsearch.client</groupId>
+			<artifactId>transport</artifactId>
+			<version>${elasticsearch.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>lang-mustache-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>percolator-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>reindex-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>transport-netty3-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.elasticsearch.plugin</groupId>
+					<artifactId>transport-netty4-client</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.codelibs</groupId>
 			<artifactId>elasticsearch-cluster-runner</artifactId>
 			<version>${cluster.runner.version}</version>
 			<exclusions>
 				<exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
+					<groupId>org.ow2.asm</groupId>
+					<artifactId>asm-debug-all</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.groovy</groupId>
+					<artifactId>groovy</artifactId>
 				</exclusion>
 			</exclusions>
 		</dependency>
diff --git a/src/main/config/es/fess_config.json b/src/main/config/es/fess_config.json
index f7339ec08043add5c9afbbb511d83f77a1e7f184..0acffadef3c49676cbc97349284c4383f735d79f 100644
--- a/src/main/config/es/fess_config.json
+++ b/src/main/config/es/fess_config.json
@@ -7,34 +7,28 @@
         },
         "properties": {
           "name": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "token": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "permissions": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "parameter_name" : {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "expiredTime" : {
             "type" : "long"
           },
           "createdBy": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "createdTime": {
             "type": "long"
           },
           "updatedBy": {
-            "type": "string",
-            "index": "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime": {
             "type": "long"
@@ -47,12 +41,10 @@
         },
         "properties" : {
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           }
         }
       },
@@ -62,12 +54,10 @@
         },
         "properties" : {
           "dataConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type" : "keyword"
           }
         }
       },
@@ -77,34 +67,28 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "processType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "regex" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "replacement" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -117,12 +101,10 @@
         },
         "properties" : {
           "boostExpr" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -131,15 +113,13 @@
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "urlExpr" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -149,12 +129,10 @@
         },
         "properties" : {
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -167,31 +145,25 @@
             "type" : "long"
           },
           "jobName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "jobStatus" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptData" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptResult" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "startTime" : {
             "type" : "long"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "lastUpdated" : {
             "type" : "long"
@@ -204,29 +176,25 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -242,12 +210,10 @@
             "type" : "float"
           },
           "configParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -256,20 +222,16 @@
             "type" : "integer"
           },
           "excludedDocUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "excludedUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedDocUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedUrls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "intervalTime" : {
             "type" : "integer"
@@ -281,33 +243,28 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "numOfThread" : {
             "type" : "integer"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "urls" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -317,49 +274,40 @@
         },
         "properties" : {
           "authRealm" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "hostname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "parameters" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "port" : {
             "type" : "integer"
           },
           "protocolScheme" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "username" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -369,12 +317,10 @@
         },
         "properties" : {
           "dataConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -384,26 +330,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "duplicateHostName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "regularName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -416,30 +358,25 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -449,27 +386,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "suggestWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetLabel" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetRole" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -488,38 +420,31 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "handlerName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "handlerParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "handlerScript" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -532,19 +457,16 @@
         },
         "properties" : {
           "crawlingInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "key" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -554,12 +476,10 @@
         },
         "properties" : {
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "webConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -569,45 +489,37 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "hostname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "parameters" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "port" : {
             "type" : "integer"
           },
           "protocolScheme" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "username" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -623,12 +535,10 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -641,8 +551,7 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -651,16 +560,13 @@
             "type" : "integer"
           },
           "query" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "term" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -673,12 +579,10 @@
         },
         "properties" : {
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roleTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -688,12 +592,10 @@
         },
         "properties" : {
           "elevateWordId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -706,35 +608,28 @@
             "type" : "float"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "reading" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "suggestWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetLabel" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "targetRole" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -747,12 +642,10 @@
         },
         "properties" : {
           "fileConfigId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labelTypeId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -768,12 +661,10 @@
             "type" : "float"
           },
           "configParameter" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
@@ -782,20 +673,16 @@
             "type" : "integer"
           },
           "excludedDocPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "excludedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedDocPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "intervalTime" : {
             "type" : "integer"
@@ -807,26 +694,22 @@
             "type" : "long"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "numOfThread" : {
             "type" : "integer"
           },
           "paths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -845,41 +728,34 @@
             "type" : "boolean"
           },
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "cronExpression" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "jobLogging" : {
             "type" : "boolean"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptData" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "scriptType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
@@ -892,30 +768,25 @@
         },
         "properties" : {
           "configId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "errorCount" : {
             "type" : "integer"
           },
           "errorLog" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "errorName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "lastAccessTime" : {
             "type" : "long"
           },
           "threadName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -925,41 +796,34 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "excludedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "includedPaths" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "permissions" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "sortOrder" : {
             "type" : "integer"
           },
           "updatedBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "updatedTime" : {
             "type" : "long"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -969,27 +833,22 @@
         },
         "properties" : {
           "createdBy" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "createdTime" : {
             "type" : "long"
           },
           "target" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "generator" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "path" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       }
diff --git a/src/main/config/es/fess_log.json b/src/main/config/es/fess_log.json
index ef1bc00aaaa8004f6a1447522c433404361f00e0..4de083666504daaa3858ce537cb407f19cd627bb 100644
--- a/src/main/config/es/fess_log.json
+++ b/src/main/config/es/fess_log.json
@@ -7,16 +7,13 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "searchLogId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "value" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -30,20 +27,16 @@
             "format" : "date_optional_time"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "docId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -61,20 +54,16 @@
             "format" : "date_optional_time"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "docId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userSessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "url" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "order" : {
             "type" : "integer"
@@ -87,24 +76,19 @@
         },
         "properties" : {
           "accessType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "user" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roles" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "queryId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "clientIp" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "hitCount" : {
             "type" : "long"
@@ -116,8 +100,7 @@
             "type" : "integer"
           },
           "referer" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "requestedAt" : {
             "type" : "date",
@@ -130,24 +113,19 @@
             "type" : "long"
           },
           "searchWord" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userAgent" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userInfoId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "userSessionId" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "languages" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
diff --git a/src/main/config/es/fess_user.json b/src/main/config/es/fess_user.json
index e1e7661faa8a8226a7b23ae5a596eae79406994d..cbb21c41858ba1dd56437d7b92157ff43c56cd08 100644
--- a/src/main/config/es/fess_user.json
+++ b/src/main/config/es/fess_user.json
@@ -7,8 +7,7 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -18,144 +17,109 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "password" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "surname" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "givenName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "employeeNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "mail" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "telephoneNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "homePhone" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "homePostalAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "labeledURI" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roomNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "description" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "title" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "pager" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "street" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postalCode" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "physicalDeliveryOfficeName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "destinationIndicator" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "internationaliSDNNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "state" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "employeeType" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "facsimileTelephoneNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postOfficeBox" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "initials" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "carLicense" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "mobile" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "postalAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "city" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "teletexTerminalIdentifier" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "x121Address" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "businessCategory" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "registeredAddress" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "displayName" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "preferredLanguage" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "departmentNumber" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "uidNumber" : {
             "type" : "long"
@@ -164,16 +128,13 @@
             "type" : "long"
           },
           "homeDirectory" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "groups" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "roles" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           }
         }
       },
@@ -183,8 +144,7 @@
         },
         "properties" : {
           "name" : {
-            "type" : "string",
-            "index" : "not_analyzed"
+            "type": "keyword"
           },
           "gidNumber" : {
             "type" : "long"
diff --git a/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java b/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
index d54f5f3c01b2d091c616b43668b66a3363ed53df..3be145cff3f5bbefd43eac8fd115c5a8a0a2291a 100644
--- a/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/BaseJsonApiManager.java
@@ -65,6 +65,18 @@ public abstract class BaseJsonApiManager extends BaseApiManager {
     }
 
     protected void writeJsonResponse(final int status, final String body, final String errMsg) {
+        String content = null;
+        if (status == 0) {
+            if (StringUtil.isNotBlank(body)) {
+                content = body;
+            }
+        } else {
+            content = "\"message\":" + escapeJson(errMsg);
+        }
+        writeJsonResponse(status, content);
+    }
+
+    protected void writeJsonResponse(final int status, final String body) {
         final String callback = LaRequestUtil.getRequest().getParameter("callback");
         final boolean isJsonp = StringUtil.isNotBlank(callback);
 
@@ -79,15 +91,9 @@ public abstract class BaseJsonApiManager extends BaseApiManager {
         buf.append(',');
         buf.append("\"status\":");
         buf.append(status);
-        if (status == 0) {
-            if (StringUtil.isNotBlank(body)) {
-                buf.append(',');
-                buf.append(body);
-            }
-        } else {
+        if (StringUtil.isNotBlank(body)) {
             buf.append(',');
-            buf.append("\"message\":");
-            buf.append(escapeJson(errMsg));
+            buf.append(body);
         }
         buf.append('}');
         buf.append('}');
diff --git a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
index 2a57411a28bb1400ff540fc05e18a5e887f1f3ac..af06491e43482a2334fd4ef800dbc7dd3c1b412f 100644
--- a/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
+++ b/src/main/java/org/codelibs/fess/api/json/JsonApiManager.java
@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.api.json;
 
-import static org.codelibs.core.stream.StreamUtil.stream;
-
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
@@ -24,7 +22,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
@@ -116,11 +113,7 @@ public class JsonApiManager extends BaseJsonApiManager {
         try {
             final PingResponse pingResponse = fessEsClient.ping();
             status = pingResponse.getStatus();
-            String errMsg = null;
-            if (status != 0) {
-                errMsg = stream(pingResponse.getFailures()).get(stream -> stream.collect(Collectors.joining()));
-            }
-            writeJsonResponse(status, null, errMsg);
+            writeJsonResponse(status, "\"message\":" + pingResponse.getMessage());
         } catch (final Exception e) {
             status = 9;
             err = e;
@@ -429,7 +422,7 @@ public class JsonApiManager extends BaseJsonApiManager {
                             final Map<String, Object> upsertMap = new HashMap<>();
                             upsertMap.put(fessConfig.getIndexFieldFavoriteCount(), 1);
                             builder.setUpsert(upsertMap);
-                            builder.setRefresh(true);
+                            builder.setRefreshPolicy(Constants.TRUE);
                         });
 
                         writeJsonResponse(0, "\"result\":\"ok\"", (String) null);
diff --git a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
index 11aac5f2ce3e5d4f38aa8a8bf7db1973fe5553bf..b08b0154a0fb4061d9c3e01cc120c9e087672bf2 100644
--- a/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
+++ b/src/main/java/org/codelibs/fess/app/service/AccessTokenService.java
@@ -57,13 +57,13 @@ public class AccessTokenService {
 
     public void store(final AccessToken accessToken) {
 
-        accessTokenBhv.insertOrUpdate(accessToken, op -> op.setRefresh(true));
+        accessTokenBhv.insertOrUpdate(accessToken, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final AccessToken accessToken) {
 
-        accessTokenBhv.delete(accessToken, op -> op.setRefresh(true));
+        accessTokenBhv.delete(accessToken, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
diff --git a/src/main/java/org/codelibs/fess/app/service/BadWordService.java b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
index 847159b0a5880454a17b11d6e6c032f201ab8cc8..97930cdeb3469b463f58616f35cfa38055c0607e 100644
--- a/src/main/java/org/codelibs/fess/app/service/BadWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BadWordService.java
@@ -74,13 +74,13 @@ public class BadWordService {
 
     public void store(final BadWord badWord) {
 
-        badWordBhv.insertOrUpdate(badWord, op -> op.setRefresh(true));
+        badWordBhv.insertOrUpdate(badWord, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final BadWord badWord) {
 
-        badWordBhv.delete(badWord, op -> op.setRefresh(true));
+        badWordBhv.delete(badWord, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
diff --git a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
index b7f84ebc8662f19429ae8b271fecfc31b6bdab49..8af5e18a2e6790ba5d6074568f74d2516c345891 100644
--- a/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/BoostDocumentRuleService.java
@@ -57,13 +57,13 @@ public class BoostDocumentRuleService {
 
     public void store(final BoostDocumentRule boostDocumentRule) {
 
-        boostDocumentRuleBhv.insertOrUpdate(boostDocumentRule, op -> op.setRefresh(true));
+        boostDocumentRuleBhv.insertOrUpdate(boostDocumentRule, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final BoostDocumentRule boostDocumentRule) {
 
-        boostDocumentRuleBhv.delete(boostDocumentRule, op -> op.setRefresh(true));
+        boostDocumentRuleBhv.delete(boostDocumentRule, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
diff --git a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
index ea2cb5fcd751f095299cd73cc07dc768390d20c6..09588ddc1ff04260913471b36932afd9195dc8a3 100644
--- a/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
+++ b/src/main/java/org/codelibs/fess/app/service/CrawlingInfoService.java
@@ -88,14 +88,14 @@ public class CrawlingInfoService {
     public void store(final CrawlingInfo crawlingInfo) {
         setupStoreCondition(crawlingInfo);
 
-        crawlingInfoBhv.insertOrUpdate(crawlingInfo, op -> op.setRefresh(true));
+        crawlingInfoBhv.insertOrUpdate(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
     public void delete(final CrawlingInfo crawlingInfo) {
         setupDeleteCondition(crawlingInfo);
 
-        crawlingInfoBhv.delete(crawlingInfo, op -> op.setRefresh(true));
+        crawlingInfoBhv.delete(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
 
     }
 
@@ -146,7 +146,7 @@ public class CrawlingInfoService {
                 crawlingInfoIdList.add(cs.getId());
             }
             crawlingInfoParamBhv.queryDelete(cb2 -> cb2.query().setCrawlingInfoId_InScope(crawlingInfoIdList));
-            crawlingInfoBhv.batchDelete(crawlingInfoList, op -> op.setRefresh(true));
+            crawlingInfoBhv.batchDelete(crawlingInfoList, op -> op.setRefreshPolicy(Constants.TRUE));
         }
     }
 
@@ -161,7 +161,7 @@ public class CrawlingInfoService {
                 crawlingInfoParam.setCreatedTime(now);
             }
         }
-        crawlingInfoParamBhv.batchInsert(crawlingInfoParamList, op -> op.setRefresh(true));
+        crawlingInfoParamBhv.batchInsert(crawlingInfoParamList, op -> op.setRefreshPolicy(Constants.TRUE));
     }
 
     public List<CrawlingInfoParam> getCrawlingInfoParamList(final String id) {
@@ -225,7 +225,7 @@ public class CrawlingInfoService {
                         crawlingInfo = new CrawlingInfo();
                         crawlingInfo.setSessionId(list.get(0));
                         crawlingInfo.setCreatedTime(formatter.parse(list.get(1)).getTime());
-                        crawlingInfoBhv.insert(crawlingInfo, op -> op.setRefresh(true));
+                        crawlingInfoBhv.insert(crawlingInfo, op -> op.setRefreshPolicy(Constants.TRUE));
                     }
 
                     final CrawlingInfoParam entity = new CrawlingInfoParam();
@@ -233,7 +233,7 @@ public class CrawlingInfoService {
                     entity.setKey(list.get(2));
                     entity.setValue(list.get(3));
                     entity.setCreatedTime(formatter.parse(list.get(4)).getTime());
-                    crawlingInfoParamBhv.insert(entity, op -> op.setRefresh(true));
+                    crawlingInfoParamBhv.insert(entity, op -> op.setRefreshPolicy(Constants.TRUE));
                 } catch (final Exception e) {
                     logger.warn("Failed to read a click log: " + list, e);
                 }
diff --git a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
index 797f80166c499f289d966b9ba6df5f843e37c7ab..3f94713845b0655fa26752fbf2011ea246e97051 100644
--- a/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DataConfigService.java
@@ -65,7 +65,7 @@ public class DataConfigService {
         final String dataConfigId = dataConfig.getId();
 
         dataConfigBhv.delete(dataConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         dataConfigToLabelBhv.queryDelete(cb -> {
@@ -124,7 +124,7 @@ public class DataConfigService {
         final String[] labelTypeIds = dataConfig.getLabelTypeIds();
 
         dataConfigBhv.insertOrUpdate(dataConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String dataConfigId = dataConfig.getId();
         if (isNew) {
@@ -138,7 +138,7 @@ public class DataConfigService {
                     fctltmList.add(mapping);
                 }
                 dataConfigToLabelBhv.batchInsert(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -169,10 +169,10 @@ public class DataConfigService {
                 }
                 fctltmList.removeAll(matchedList);
                 dataConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 dataConfigToLabelBhv.batchDelete(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
diff --git a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
index d6e82c59bae78c9d7c5ebaf3d1d2212e2ef1bc6c..7430631370b8ee32846919b5cdf50d8c96204fdd 100644
--- a/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
+++ b/src/main/java/org/codelibs/fess/app/service/DuplicateHostService.java
@@ -60,7 +60,7 @@ public class DuplicateHostService {
     public void store(final DuplicateHost duplicateHost) {
 
         duplicateHostBhv.insertOrUpdate(duplicateHost, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class DuplicateHostService {
     public void delete(final DuplicateHost duplicateHost) {
 
         duplicateHostBhv.delete(duplicateHost, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
index 52c4a711179656f4083f709543210012c94365fe..60811a27d2a4f2e35f76f360f4004c53fb43e719 100644
--- a/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ElevateWordService.java
@@ -105,7 +105,7 @@ public class ElevateWordService {
         final String[] labelTypeIds = elevateWord.getLabelTypeIds();
 
         elevateWordBhv.insertOrUpdate(elevateWord, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String elevateWordId = elevateWord.getId();
         if (isNew) {
@@ -119,7 +119,7 @@ public class ElevateWordService {
                     wctltmList.add(mapping);
                 }
                 elevateWordToLabelBhv.batchInsert(wctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -150,10 +150,10 @@ public class ElevateWordService {
                 }
                 list.removeAll(matchedList);
                 elevateWordToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 elevateWordToLabelBhv.batchDelete(list, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
@@ -162,7 +162,7 @@ public class ElevateWordService {
     public void delete(final ElevateWord elevateWord) {
 
         elevateWordBhv.delete(elevateWord, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
index 7187351eb131c76fceb1b78dd2aea54baf189194..e42a0bd7aecaf8fc7e5620fed9d7d01fb022ebfe 100644
--- a/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FailureUrlService.java
@@ -72,7 +72,7 @@ public class FailureUrlService {
     public void store(final FailureUrl failureUrl) {
 
         failureUrlBhv.insertOrUpdate(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -80,7 +80,7 @@ public class FailureUrlService {
     public void delete(final FailureUrl failureUrl) {
 
         failureUrlBhv.delete(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -193,7 +193,7 @@ public class FailureUrlService {
         failureUrl.setThreadName(Thread.currentThread().getName());
 
         bhv.insertOrUpdate(failureUrl, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 
diff --git a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
index 4eabea338921290a35b5bfcc815e262b1c01299b..01fa87e67fe65230e00a5ebc0e51f44fa0ea2ced 100644
--- a/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileAuthenticationService.java
@@ -60,7 +60,7 @@ public class FileAuthenticationService {
     public void store(final FileAuthentication fileAuthentication) {
 
         fileAuthenticationBhv.insertOrUpdate(fileAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class FileAuthenticationService {
     public void delete(final FileAuthentication fileAuthentication) {
 
         fileAuthenticationBhv.delete(fileAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
index be71e9c9f18042a7edb72787be61b9a846079b47..defb4ec39b62d4e532795f1fb56c8a9a9eb6b9a5 100644
--- a/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/FileConfigService.java
@@ -68,7 +68,7 @@ public class FileConfigService {
         final String fileConfigId = fileConfig.getId();
 
         fileConfigBhv.delete(fileConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         fileConfigToLabelBhv.queryDelete(cb -> {
@@ -129,7 +129,7 @@ public class FileConfigService {
         final String[] labelTypeIds = fileConfig.getLabelTypeIds();
 
         fileConfigBhv.insertOrUpdate(fileConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String fileConfigId = fileConfig.getId();
         if (isNew) {
@@ -143,7 +143,7 @@ public class FileConfigService {
                     fctltmList.add(mapping);
                 }
                 fileConfigToLabelBhv.batchInsert(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -174,10 +174,10 @@ public class FileConfigService {
                 }
                 fctltmList.removeAll(matchedList);
                 fileConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 fileConfigToLabelBhv.batchDelete(fctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
diff --git a/src/main/java/org/codelibs/fess/app/service/GroupService.java b/src/main/java/org/codelibs/fess/app/service/GroupService.java
index 655e7869c843a66d590348c846a8db4456c7142e..94d67a96c7c2c23d7dcfc48248e2f9b7ec94cd96 100644
--- a/src/main/java/org/codelibs/fess/app/service/GroupService.java
+++ b/src/main/java/org/codelibs/fess/app/service/GroupService.java
@@ -71,7 +71,7 @@ public class GroupService {
         ComponentUtil.getLdapManager().insert(group);
 
         groupBhv.insertOrUpdate(group, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -80,7 +80,7 @@ public class GroupService {
         ComponentUtil.getLdapManager().delete(group);
 
         groupBhv.delete(group, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         userBhv.selectCursor(
diff --git a/src/main/java/org/codelibs/fess/app/service/JobLogService.java b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
index d66bf5df72716cb86bd239c81e26f5291ae785e1..b8407865e6789417f9fe3bff45a15954aaa8255d 100644
--- a/src/main/java/org/codelibs/fess/app/service/JobLogService.java
+++ b/src/main/java/org/codelibs/fess/app/service/JobLogService.java
@@ -59,7 +59,7 @@ public class JobLogService {
     public void store(final JobLog jobLog) {
 
         jobLogBhv.insertOrUpdate(jobLog, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -67,7 +67,7 @@ public class JobLogService {
     public void delete(final JobLog jobLog) {
 
         jobLogBhv.delete(jobLog, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
index 6c24683227b20c11db576f30479deff591f26d01..2bb476500f8db45c68beaf20b77134c55953bbd8 100644
--- a/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/KeyMatchService.java
@@ -60,7 +60,7 @@ public class KeyMatchService {
     public void store(final KeyMatch keyMatch) {
 
         keyMatchBhv.insertOrUpdate(keyMatch, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class KeyMatchService {
     public void delete(final KeyMatch keyMatch) {
 
         keyMatchBhv.delete(keyMatch, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
index 813027ec25f215133863fd7e09612be4d8e85b6e..7723276b79717396e0d7d68c3ee75fdbf2c44174 100644
--- a/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/LabelTypeService.java
@@ -58,7 +58,7 @@ public class LabelTypeService {
     public void delete(final LabelType labelType) {
 
         labelTypeBhv.delete(labelType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         final LabelTypeHelper labelTypeHelper = ComponentUtil.getLabelTypeHelper();
@@ -90,7 +90,7 @@ public class LabelTypeService {
 
     public void store(final LabelType labelType) {
         labelTypeBhv.insertOrUpdate(labelType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         final LabelTypeHelper labelTypeHelper = ComponentUtil.getLabelTypeHelper();
diff --git a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
index 728cccf39c289360aa348f6ced4f05f87a8aadc2..e52291e783ed065801f21d169e3a86b27fd20ff3 100644
--- a/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
+++ b/src/main/java/org/codelibs/fess/app/service/PathMappingService.java
@@ -62,7 +62,7 @@ public class PathMappingService {
     public void store(final PathMapping pathMapping) {
 
         pathMappingBhv.insertOrUpdate(pathMapping, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         ComponentUtil.getPathMappingHelper().init();
@@ -71,7 +71,7 @@ public class PathMappingService {
     public void delete(final PathMapping pathMapping) {
 
         pathMappingBhv.delete(pathMapping, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         ComponentUtil.getPathMappingHelper().init();
diff --git a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
index 1dd3866d41334a093395c06e7c742e9d2e9c2cc5..1c3b9be2be922b6eb06a06afd4dcc22afe2aa040 100644
--- a/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RequestHeaderService.java
@@ -60,7 +60,7 @@ public class RequestHeaderService {
     public void store(final RequestHeader requestHeader) {
 
         requestHeaderBhv.insertOrUpdate(requestHeader, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class RequestHeaderService {
     public void delete(final RequestHeader requestHeader) {
 
         requestHeaderBhv.delete(requestHeader, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/RoleService.java b/src/main/java/org/codelibs/fess/app/service/RoleService.java
index 2ab5ad92d7810f0b0176a0554edd534195adaaab..0903f977decb32f8e769d71e0fad6d687dc5e3c5 100644
--- a/src/main/java/org/codelibs/fess/app/service/RoleService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleService.java
@@ -68,7 +68,7 @@ public class RoleService {
         ComponentUtil.getLdapManager().insert(role);
 
         roleBhv.insertOrUpdate(role, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -77,7 +77,7 @@ public class RoleService {
         ComponentUtil.getLdapManager().delete(role);
 
         roleBhv.delete(role, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         userBhv.selectCursor(
diff --git a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
index f8c007346b4e0a839360986dd323be3fa8e4bd2b..2c7bd22c6f029e253640353d035542e55b56d30d 100644
--- a/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
+++ b/src/main/java/org/codelibs/fess/app/service/RoleTypeService.java
@@ -60,7 +60,7 @@ public class RoleTypeService {
     public void store(final RoleType roleType) {
 
         roleTypeBhv.insertOrUpdate(roleType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class RoleTypeService {
     public void delete(final RoleType roleType) {
 
         roleTypeBhv.delete(roleType, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
index 124faf991980e9c38e86950182c22741905f530f..250c40c599fccae3c5f72d50d7e331312b783070 100644
--- a/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
+++ b/src/main/java/org/codelibs/fess/app/service/ScheduledJobService.java
@@ -73,7 +73,7 @@ public class ScheduledJobService {
 
     public void delete(final ScheduledJob scheduledJob) {
         scheduledJobBhv.delete(scheduledJob, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 
@@ -101,7 +101,7 @@ public class ScheduledJobService {
 
     public void store(final ScheduledJob scheduledJob) {
         scheduledJobBhv.insertOrUpdate(scheduledJob, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 
diff --git a/src/main/java/org/codelibs/fess/app/service/SearchService.java b/src/main/java/org/codelibs/fess/app/service/SearchService.java
index 4217092a5aa34b0616f412c94dfd000ad0031949..b6850774ea832d902b37946237d147d2a9e30cb4 100644
--- a/src/main/java/org/codelibs/fess/app/service/SearchService.java
+++ b/src/main/java/org/codelibs/fess/app/service/SearchService.java
@@ -47,6 +47,7 @@ import org.dbflute.optional.OptionalEntity;
 import org.dbflute.optional.OptionalThing;
 import org.dbflute.util.DfTypeUtil;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
@@ -215,7 +216,7 @@ public class SearchService {
             final OptionalThing<FessUserBean> userBean) {
         return fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
             builder.setQuery(QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), docId));
-            builder.addFields(fields);
+            builder.setFetchSource(fields, null);
             fessConfig.processSearchPreference(builder, userBean);
             return true;
         });
@@ -226,7 +227,7 @@ public class SearchService {
         return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(), builder -> {
             builder.setQuery(QueryBuilders.termsQuery(fessConfig.getIndexFieldDocId(), docIds));
             builder.setSize(fessConfig.getPagingSearchPageMaxSizeAsInteger().intValue());
-            builder.addFields(fields);
+            builder.setFetchSource(fields, null);
             fessConfig.processSearchPreference(builder, userBean);
             return true;
         });
@@ -242,7 +243,7 @@ public class SearchService {
                     fessEsClient.prepareUpdate(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), id);
             builderLambda.accept(builder);
             final UpdateResponse response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
-            return response.isCreated();
+            return response.getResult() == Result.CREATED || response.getResult() == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to update doc  " + id, e);
         }
diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java
index 25065566d672efbc97a06cf7455a5d73c7f507fb..d4c4529b8952c9b6e73d46f425fc0f13eafe9f94 100644
--- a/src/main/java/org/codelibs/fess/app/service/UserService.java
+++ b/src/main/java/org/codelibs/fess/app/service/UserService.java
@@ -75,7 +75,7 @@ public class UserService {
         ComponentUtil.getLdapManager().insert(user);
 
         userBhv.insertOrUpdate(user, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -88,7 +88,7 @@ public class UserService {
             userBhv.selectEntity(cb -> cb.query().setName_Equal(username)).ifPresent(entity -> {
                 final String encodedPassword = fessLoginAssist.encryptPassword(password);
                 entity.setPassword(encodedPassword);
-                userBhv.insertOrUpdate(entity, op -> op.setRefresh(true));
+                userBhv.insertOrUpdate(entity, op -> op.setRefreshPolicy(Constants.TRUE));
             }).orElse(() -> {
                 throw new FessUserNotFoundException(username);
             });
@@ -100,7 +100,7 @@ public class UserService {
         ComponentUtil.getLdapManager().delete(user);
 
         userBhv.delete(user, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
index 60a31825c0646b5ba46d894e2d5e9d0d9048c69c..c2c8087bc4c855238b91a260f045512911f5b7a5 100644
--- a/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebAuthenticationService.java
@@ -60,7 +60,7 @@ public class WebAuthenticationService {
     public void store(final WebAuthentication webAuthentication) {
 
         webAuthenticationBhv.insertOrUpdate(webAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
@@ -68,7 +68,7 @@ public class WebAuthenticationService {
     public void delete(final WebAuthentication webAuthentication) {
 
         webAuthenticationBhv.delete(webAuthentication, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
     }
diff --git a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
index 81b134fefebe9f02701bc113a9158a48d81c77cd..316ff819f66f75795932ed436b402e489bb6a0e2 100644
--- a/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
+++ b/src/main/java/org/codelibs/fess/app/service/WebConfigService.java
@@ -72,7 +72,7 @@ public class WebConfigService {
         final String webConfigId = webConfig.getId();
 
         webConfigBhv.delete(webConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
 
         webConfigToLabelBhv.queryDelete(cb -> {
@@ -138,7 +138,7 @@ public class WebConfigService {
         final String[] labelTypeIds = webConfig.getLabelTypeIds();
 
         webConfigBhv.insertOrUpdate(webConfig, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         final String webConfigId = webConfig.getId();
         if (isNew) {
@@ -152,7 +152,7 @@ public class WebConfigService {
                     wctltmList.add(mapping);
                 }
                 webConfigToLabelBhv.batchInsert(wctltmList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         } else {
@@ -183,10 +183,10 @@ public class WebConfigService {
                 }
                 list.removeAll(matchedList);
                 webConfigToLabelBhv.batchInsert(newList, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
                 webConfigToLabelBhv.batchDelete(list, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
diff --git a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
index 71e967c3dbb927befc5da7c928905d2d040d1c9c..877df2ebcf0bc8ea507aeccc2230bf01043807f3 100644
--- a/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/admin/upgrade/AdminUpgradeAction.java
@@ -1152,7 +1152,7 @@ public class AdminUpgradeAction extends FessAdminAction {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.warn("Failed to delete " + index + " index.", e);
             }
         });
diff --git a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
index d9e48601285e0c9e90c62f245ed272126fc930db..7b2a6e1a91fb56e3600eedfcd7ec23336311830b 100644
--- a/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/cache/CacheAction.java
@@ -61,7 +61,7 @@ public class CacheAction extends FessSearchAction {
                             queryRequestBuilder -> {
                                 final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                                 queryRequestBuilder.setQuery(termQuery);
-                                queryRequestBuilder.addFields(queryHelper.getCacheResponseFields());
+                                queryRequestBuilder.setFetchSource(queryHelper.getCacheResponseFields(), null);
                                 fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                                 return true;
                             }).orElse(null);
diff --git a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
index ca0cf141227e6827c36b089745b996346dd34f06..20b48d26cd95113f26ed7cdb1aa8a5f90911f86d 100644
--- a/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/go/GoAction.java
@@ -77,11 +77,14 @@ public class GoAction extends FessSearchAction {
         Map<String, Object> doc = null;
         try {
             doc =
-                    fessEsClient.getDocument(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
+                    fessEsClient.getDocument(
+                            fessConfig.getIndexDocumentSearchIndex(),
+                            fessConfig.getIndexDocumentType(),
                             queryRequestBuilder -> {
                                 final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                                 queryRequestBuilder.setQuery(termQuery);
-                                queryRequestBuilder.addFields(fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId());
+                                queryRequestBuilder.setFetchSource(
+                                        new String[] { fessConfig.getIndexFieldUrl(), fessConfig.getIndexFieldConfigId() }, null);
                                 fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                                 return true;
                             }).orElse(null);
diff --git a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java
index 7e14ba532cc5c94bebd37d20efb987b73a919366..ab855e54443a47839cd35461b9752dba8f4872ca 100644
--- a/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java
+++ b/src/main/java/org/codelibs/fess/app/web/thumbnail/ThumbnailAction.java
@@ -58,7 +58,7 @@ public class ThumbnailAction extends FessSearchAction {
                         queryRequestBuilder -> {
                             final TermQueryBuilder termQuery = QueryBuilders.termQuery(fessConfig.getIndexFieldDocId(), form.docId);
                             queryRequestBuilder.setQuery(termQuery);
-                            queryRequestBuilder.addFields(queryHelper.getResponseFields());
+                            queryRequestBuilder.setFetchSource(queryHelper.getResponseFields(), null);
                             fessConfig.processSearchPreference(queryRequestBuilder, getUserBean());
                             return true;
                         }).orElse(null);
diff --git a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
index 216a36fc51bf21560183d187e1bd65f32dd9eff2..f6291998c2969584b5b0248b34fd045bf0442a42 100644
--- a/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
+++ b/src/main/java/org/codelibs/fess/ds/impl/EsDataStoreImpl.java
@@ -38,11 +38,12 @@ import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,7 +82,7 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
         final long readInterval = getReadInterval(paramMap);
 
         final Settings settings =
-                Settings.settingsBuilder()
+                Settings.builder()
                         .put(paramMap
                                 .entrySet()
                                 .stream()
@@ -103,7 +104,8 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
             }
             return null;
         }).filter(v -> v != null).toArray(n -> new InetSocketTransportAddress[n]));
-        try (Client client = TransportClient.builder().settings(settings).build().addTransportAddresses(addresses)) {
+        try (PreBuiltTransportClient client = new PreBuiltTransportClient(settings)) {
+            client.addTransportAddresses(addresses);
             processData(dataConfig, callback, paramMap, scriptMap, defaultDataMap, readInterval, client);
         }
     }
@@ -128,9 +130,10 @@ public class EsDataStoreImpl extends AbstractDataStoreImpl {
             builder.setSize(Integer.parseInt(paramMap.get(SIZE)));
         }
         if (paramMap.containsKey(FIELDS)) {
-            builder.addFields(paramMap.get(FIELDS).trim().split(","));
+            builder.setFetchSource(paramMap.get(FIELDS).trim().split(","), null);
         }
-        builder.setQuery(paramMap.containsKey(QUERY) ? paramMap.get(QUERY).trim() : "{\"query\":{\"match_all\":{}}}");
+        builder.setQuery(QueryBuilders.wrapperQuery(paramMap.containsKey(QUERY) ? paramMap.get(QUERY).trim()
+                : "{\"query\":{\"match_all\":{}}}"));
         builder.setScroll(scroll);
         builder.setPreference(paramMap.containsKey(PREFERENCE) ? paramMap.get(PREFERENCE).trim() : Constants.SEARCH_PREFERENCE_PRIMARY);
         try {
diff --git a/src/main/java/org/codelibs/fess/entity/GeoInfo.java b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
index 311170e50545d350a4a95a364b21aac7517edcba..5ae837f754e1229858491bf4db786d8eaa6487e3 100644
--- a/src/main/java/org/codelibs/fess/entity/GeoInfo.java
+++ b/src/main/java/org/codelibs/fess/entity/GeoInfo.java
@@ -64,8 +64,8 @@ public class GeoInfo {
                                                         try {
                                                             final double lat = Double.parseDouble(values[0]);
                                                             final double lon = Double.parseDouble(values[1]);
-                                                            list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance).lat(lat)
-                                                                    .lon(lon));
+                                                            list.add(QueryBuilders.geoDistanceQuery(geoField).distance(distance)
+                                                                    .point(lat, lon));
                                                         } catch (final Exception ex) {
                                                             throw new InvalidQueryException(messages -> messages
                                                                     .addErrorsInvalidQueryUnknown(UserMessages.GLOBAL_PROPERTY_KEY), ex
diff --git a/src/main/java/org/codelibs/fess/entity/PingResponse.java b/src/main/java/org/codelibs/fess/entity/PingResponse.java
index ab39ff5682464eafbb939a92661537dfca68cea5..c8ac7065ec3fdd65fcb192f45b5a468988ac15f3 100644
--- a/src/main/java/org/codelibs/fess/entity/PingResponse.java
+++ b/src/main/java/org/codelibs/fess/entity/PingResponse.java
@@ -15,35 +15,43 @@
  */
 package org.codelibs.fess.entity;
 
-import java.util.List;
+import java.io.IOException;
 
+import org.codelibs.core.lang.StringUtil;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
+import org.elasticsearch.common.xcontent.ToXContent;
+import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.common.xcontent.XContentFactory;
 
 public class PingResponse {
     private final int status;
 
-    private final List<String> failures;
-
     private final String clusterName;
 
     private final String clusterStatus;
 
+    private String message = StringUtil.EMPTY;
+
     public PingResponse(final ClusterHealthResponse response) {
         status = response.getStatus() == ClusterHealthStatus.RED ? 1 : 0;
-        failures = response.getValidationFailures();
         clusterName = response.getClusterName();
         clusterStatus = response.getStatus().toString();
+        try {
+            XContentBuilder builder = XContentFactory.jsonBuilder();
+            builder.startObject();
+            response.toXContent(builder, ToXContent.EMPTY_PARAMS);
+            builder.endObject();
+            message = builder.string();
+        } catch (IOException e) {
+            message = "{ \"error\" : \"" + e.getMessage() + "\"}";
+        }
     }
 
     public int getStatus() {
         return status;
     }
 
-    public String[] getFailures() {
-        return failures.stream().toArray(n -> new String[n]);
-    }
-
     public String getClusterName() {
         return clusterName;
     }
@@ -51,4 +59,9 @@ public class PingResponse {
     public String getClusterStatus() {
         return clusterStatus;
     }
+
+    public String getMessage() {
+        return message;
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/entity/QueryContext.java b/src/main/java/org/codelibs/fess/entity/QueryContext.java
index fcbf31227c1ba0b5b26e36dfe8274dd0bf7daff9..1dc5b64cc9d632e41085363c58472831aac7d36a 100644
--- a/src/main/java/org/codelibs/fess/entity/QueryContext.java
+++ b/src/main/java/org/codelibs/fess/entity/QueryContext.java
@@ -31,7 +31,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.lastaflute.web.util.LaRequestUtil;
 
@@ -64,10 +64,10 @@ public class QueryContext {
         }
     }
 
-    public void addFunctionScore(final Consumer<FunctionScoreQueryBuilder> functionScoreQuery) {
-        final FunctionScoreQueryBuilder builder = QueryBuilders.functionScoreQuery(queryBuilder);
-        functionScoreQuery.accept(builder);
-        queryBuilder = builder;
+    public void addFunctionScore(final Consumer<List<FilterFunctionBuilder>> functionScoreQuery) {
+        List<FilterFunctionBuilder> list = new ArrayList<>();
+        functionScoreQuery.accept(list);
+        queryBuilder = QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
     }
 
     public void addQuery(final Consumer<BoolQueryBuilder> boolQuery) {
diff --git a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
index 8e8ef5abb4f900bdf3e1095be18a5dfe377c3701..a8b86a18d301c306f0cdadf8aef7ac3fad506bbe 100644
--- a/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
+++ b/src/main/java/org/codelibs/fess/es/client/FessEsClient.java
@@ -31,8 +31,6 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
@@ -71,6 +69,7 @@ import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
 import org.elasticsearch.action.admin.indices.alias.IndicesAliasesResponse;
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
@@ -85,15 +84,9 @@ import org.elasticsearch.action.bulk.BulkItemResponse.Failure;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
 import org.elasticsearch.action.bulk.BulkResponse;
-import org.elasticsearch.action.count.CountRequest;
-import org.elasticsearch.action.count.CountRequestBuilder;
-import org.elasticsearch.action.count.CountResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteRequestBuilder;
 import org.elasticsearch.action.delete.DeleteResponse;
-import org.elasticsearch.action.exists.ExistsRequest;
-import org.elasticsearch.action.exists.ExistsRequestBuilder;
-import org.elasticsearch.action.exists.ExistsResponse;
 import org.elasticsearch.action.explain.ExplainRequest;
 import org.elasticsearch.action.explain.ExplainRequestBuilder;
 import org.elasticsearch.action.explain.ExplainResponse;
@@ -110,21 +103,6 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexRequest.OpType;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.index.IndexResponse;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptRequest;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptRequestBuilder;
-import org.elasticsearch.action.indexedscripts.delete.DeleteIndexedScriptResponse;
-import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptRequest;
-import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptRequestBuilder;
-import org.elasticsearch.action.indexedscripts.get.GetIndexedScriptResponse;
-import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
-import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequestBuilder;
-import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
-import org.elasticsearch.action.percolate.MultiPercolateRequest;
-import org.elasticsearch.action.percolate.MultiPercolateRequestBuilder;
-import org.elasticsearch.action.percolate.MultiPercolateResponse;
-import org.elasticsearch.action.percolate.PercolateRequest;
-import org.elasticsearch.action.percolate.PercolateRequestBuilder;
-import org.elasticsearch.action.percolate.PercolateResponse;
 import org.elasticsearch.action.search.ClearScrollRequest;
 import org.elasticsearch.action.search.ClearScrollRequestBuilder;
 import org.elasticsearch.action.search.ClearScrollResponse;
@@ -137,9 +115,7 @@ import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchScrollRequest;
 import org.elasticsearch.action.search.SearchScrollRequestBuilder;
-import org.elasticsearch.action.suggest.SuggestRequest;
-import org.elasticsearch.action.suggest.SuggestRequestBuilder;
-import org.elasticsearch.action.suggest.SuggestResponse;
+import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
 import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
 import org.elasticsearch.action.termvectors.MultiTermVectorsRequestBuilder;
 import org.elasticsearch.action.termvectors.MultiTermVectorsResponse;
@@ -151,7 +127,6 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.AdminClient;
 import org.elasticsearch.client.Client;
-import org.elasticsearch.client.support.Headers;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.cluster.metadata.MappingMetaData;
 import org.elasticsearch.common.collect.ImmutableOpenMap;
@@ -169,8 +144,10 @@ import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.lastaflute.core.message.UserMessages;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -279,10 +256,10 @@ public class FessEsClient implements Client {
             client = runner.client();
             addTransportAddress("localhost", runner.node().settings().getAsInt("transport.tcp.port", 9300));
         } else {
-            final Builder settingsBuilder = Settings.settingsBuilder();
+            final Builder settingsBuilder = Settings.builder();
             settingsBuilder.put("cluster.name", fessConfig.getElasticsearchClusterName());
             final Settings settings = settingsBuilder.build();
-            final TransportClient transportClient = TransportClient.builder().settings(settings).build();
+            final TransportClient transportClient = new PreBuiltTransportClient(settings);
             for (final TransportAddress address : transportAddressList) {
                 transportClient.addTransportAddress(address);
             }
@@ -567,8 +544,9 @@ public class FessEsClient implements Client {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         SearchResponse response =
                 client.prepareSearch(index).setTypes(type).setScroll(scrollForDelete).setSize(sizeForDelete)
-                        .addField(fessConfig.getIndexFieldId()).setQuery(queryBuilder).setPreference(Constants.SEARCH_PREFERENCE_PRIMARY)
-                        .execute().actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
+                        .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null).setQuery(queryBuilder)
+                        .setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).execute()
+                        .actionGet(fessConfig.getIndexScrollSearchTimeoutTimeout());
 
         int count = 0;
         String scrollId = response.getScrollId();
@@ -604,21 +582,6 @@ public class FessEsClient implements Client {
         GetResponse response = null;
         final GetRequestBuilder requestBuilder = client.prepareGet(index, type, id);
         if (condition.build(requestBuilder)) {
-
-            if (ComponentUtil.hasQueryHelper()) {
-                final QueryHelper queryHelper = ComponentUtil.getQueryHelper();
-                for (final Map.Entry<String, String[]> entry : queryHelper.getQueryRequestHeaderMap().entrySet()) {
-                    requestBuilder.putHeader(entry.getKey(), entry.getValue());
-                }
-
-                final Set<Entry<String, String[]>> paramSet = queryHelper.getRequestParameterSet();
-                if (!paramSet.isEmpty()) {
-                    for (final Map.Entry<String, String[]> entry : paramSet) {
-                        requestBuilder.putHeader(entry.getKey(), entry.getValue());
-                    }
-                }
-            }
-
             response = requestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexSearchTimeout());
         }
         final long execTime = System.currentTimeMillis() - startTime;
@@ -639,17 +602,6 @@ public class FessEsClient implements Client {
                 if (queryHelper.getTimeAllowed() >= 0) {
                     searchRequestBuilder.setTimeout(TimeValue.timeValueMillis(queryHelper.getTimeAllowed()));
                 }
-
-                for (final Map.Entry<String, String[]> entry : queryHelper.getQueryRequestHeaderMap().entrySet()) {
-                    searchRequestBuilder.putHeader(entry.getKey(), entry.getValue());
-                }
-
-                final Set<Entry<String, String[]>> paramSet = queryHelper.getRequestParameterSet();
-                if (!paramSet.isEmpty()) {
-                    for (final Map.Entry<String, String[]> entry : paramSet) {
-                        searchRequestBuilder.putHeader(entry.getKey(), entry.getValue());
-                    }
-                }
             }
 
             try {
@@ -744,7 +696,8 @@ public class FessEsClient implements Client {
 
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         final SearchResponse response =
-                client.prepareSearch(index).setTypes(type).setSize(1).setQuery(queryBuilder).addField(fessConfig.getIndexFieldId())
+                client.prepareSearch(index).setTypes(type).setSize(1).setQuery(queryBuilder)
+                        .setFetchSource(new String[] { fessConfig.getIndexFieldId() }, null)
                         .setPreference(Constants.SEARCH_PREFERENCE_PRIMARY).execute().actionGet(fessConfig.getIndexSearchTimeout());
         final SearchHits hits = response.getHits();
         if (hits.getTotalHits() != 0) {
@@ -802,8 +755,10 @@ public class FessEsClient implements Client {
 
     public boolean update(final String index, final String type, final String id, final String field, final Object value) {
         try {
-            return client.prepareUpdate(index, type, id).setDoc(field, value).execute()
-                    .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).isCreated();
+            final Result result =
+                    client.prepareUpdate(index, type, id).setDoc(field, value).execute()
+                            .actionGet(ComponentUtil.getFessConfig().getIndexIndexTimeout()).getResult();
+            return result == Result.CREATED || result == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to set " + value + " to " + field + " for doc " + id, e);
         }
@@ -819,7 +774,7 @@ public class FessEsClient implements Client {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.error("Failed to refresh " + stream(indices).get(stream -> stream.collect(Collectors.joining(", "))) + ".", e);
             }
         });
@@ -837,7 +792,7 @@ public class FessEsClient implements Client {
             }
 
             @Override
-            public void onFailure(final Throwable e) {
+            public void onFailure(final Exception e) {
                 logger.error("Failed to flush " + stream(indices).get(stream -> stream.collect(Collectors.joining(", "))) + ".", e);
             }
         });
@@ -864,8 +819,7 @@ public class FessEsClient implements Client {
         final BulkResponse response = bulkRequestBuilder.execute().actionGet(ComponentUtil.getFessConfig().getIndexBulkTimeout());
         if (response.hasFailures()) {
             if (logger.isDebugEnabled()) {
-                @SuppressWarnings("rawtypes")
-                final List<ActionRequest> requests = bulkRequestBuilder.request().requests();
+                final List<ActionRequest<?>> requests = bulkRequestBuilder.request().requests();
                 final BulkItemResponse[] items = response.getItems();
                 if (requests.size() == items.length) {
                     for (int i = 0; i < requests.size(); i++) {
@@ -963,48 +917,52 @@ public class FessEsClient implements Client {
             searchRequestBuilder.setFrom(offset).setSize(size);
 
             if (responseFields != null) {
-                searchRequestBuilder.addFields(responseFields);
+                searchRequestBuilder.setFetchSource(responseFields, null);
             }
 
             // sort
             queryContext.sortBuilders().forEach(sortBuilder -> searchRequestBuilder.addSort(sortBuilder));
 
             // highlighting
-            queryHelper.highlightedFields(stream -> stream.forEach(hf -> searchRequestBuilder.addHighlightedField(hf,
+            HighlightBuilder highlightBuilder = new HighlightBuilder();
+            queryHelper.highlightedFields(stream -> stream.forEach(hf -> highlightBuilder.field(hf,
                     fessConfig.getQueryHighlightFragmentSizeAsInteger())));
+            searchRequestBuilder.highlighter(highlightBuilder);
 
             // facets
             if (facetInfo != null) {
-                stream(facetInfo.field).of(stream -> stream.forEach(f -> {
-                    if (queryHelper.isFacetField(f)) {
-                        final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
-                        final TermsBuilder termsBuilder = AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
-                        if ("term".equals(facetInfo.sort)) {
-                            termsBuilder.order(Order.term(true));
-                        } else if ("count".equals(facetInfo.sort)) {
-                            termsBuilder.order(Order.count(true));
-                        }
-                        if (facetInfo.size != null) {
-                            termsBuilder.size(facetInfo.size);
-                        }
-                        if (facetInfo.minDocCount != null) {
-                            termsBuilder.minDocCount(facetInfo.minDocCount);
-                        }
-                        if (facetInfo.missing != null) {
-                            termsBuilder.missing(facetInfo.missing);
-                        }
-                        searchRequestBuilder.addAggregation(termsBuilder);
-                    } else {
-                        throw new SearchQueryException("Invalid facet field: " + f);
-                    }
-                }));
+                stream(facetInfo.field).of(
+                        stream -> stream.forEach(f -> {
+                            if (queryHelper.isFacetField(f)) {
+                                final String encodedField = BaseEncoding.base64().encode(f.getBytes(StandardCharsets.UTF_8));
+                                final TermsAggregationBuilder termsBuilder =
+                                        AggregationBuilders.terms(Constants.FACET_FIELD_PREFIX + encodedField).field(f);
+                                if ("term".equals(facetInfo.sort)) {
+                                    termsBuilder.order(Order.term(true));
+                                } else if ("count".equals(facetInfo.sort)) {
+                                    termsBuilder.order(Order.count(true));
+                                }
+                                if (facetInfo.size != null) {
+                                    termsBuilder.size(facetInfo.size);
+                                }
+                                if (facetInfo.minDocCount != null) {
+                                    termsBuilder.minDocCount(facetInfo.minDocCount);
+                                }
+                                if (facetInfo.missing != null) {
+                                    termsBuilder.missing(facetInfo.missing);
+                                }
+                                searchRequestBuilder.addAggregation(termsBuilder);
+                            } else {
+                                throw new SearchQueryException("Invalid facet field: " + f);
+                            }
+                        }));
                 stream(facetInfo.query).of(
                         stream -> stream.forEach(fq -> {
                             final QueryContext facetContext = new QueryContext(fq, false);
                             queryHelper.buildBaseQuery(facetContext, c -> {});
                             final String encodedFacetQuery = BaseEncoding.base64().encode(fq.getBytes(StandardCharsets.UTF_8));
                             final FilterAggregationBuilder filterBuilder =
-                                    AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery).filter(
+                                    AggregationBuilders.filter(Constants.FACET_QUERY_PREFIX + encodedFacetQuery,
                                             facetContext.getQueryBuilder());
                             searchRequestBuilder.addAggregation(filterBuilder);
                         }));
@@ -1029,18 +987,20 @@ public class FessEsClient implements Client {
             if (id == null) {
                 // create
                 response =
-                        client.prepareIndex(index, type).setSource(new DocMap(source)).setRefresh(true).setOpType(OpType.CREATE).execute()
-                                .actionGet(fessConfig.getIndexIndexTimeout());
+                        client.prepareIndex(index, type).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+                                .setOpType(OpType.CREATE).execute().actionGet(fessConfig.getIndexIndexTimeout());
             } else {
                 // create or update
                 final IndexRequestBuilder builder =
-                        client.prepareIndex(index, type, id).setSource(new DocMap(source)).setRefresh(true).setOpType(OpType.INDEX);
+                        client.prepareIndex(index, type, id).setSource(new DocMap(source)).setRefreshPolicy(RefreshPolicy.IMMEDIATE)
+                                .setOpType(OpType.INDEX);
                 if (version != null && version.longValue() > 0) {
                     builder.setVersion(version);
                 }
                 response = builder.execute().actionGet(fessConfig.getIndexIndexTimeout());
             }
-            return response.isCreated();
+            final Result result = response.getResult();
+            return result == Result.CREATED || result == Result.UPDATED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to store: " + obj, e);
         }
@@ -1048,12 +1008,12 @@ public class FessEsClient implements Client {
 
     public boolean delete(final String index, final String type, final String id, final long version) {
         try {
-            final DeleteRequestBuilder builder = client.prepareDelete(index, type, id).setRefresh(true);
+            final DeleteRequestBuilder builder = client.prepareDelete(index, type, id).setRefreshPolicy(RefreshPolicy.IMMEDIATE);
             if (version > 0) {
                 builder.setVersion(version);
             }
             final DeleteResponse response = builder.execute().actionGet(ComponentUtil.getFessConfig().getIndexDeleteTimeout());
-            return response.isFound();
+            return response.getResult() == Result.DELETED;
         } catch (final ElasticsearchException e) {
             throw new FessEsClientException("Failed to delete: " + index + "/" + type + "/" + id + "/" + version, e);
         }
@@ -1189,66 +1149,6 @@ public class FessEsClient implements Client {
         return client.prepareGet(index, type, id);
     }
 
-    @Override
-    public PutIndexedScriptRequestBuilder preparePutIndexedScript() {
-        return client.preparePutIndexedScript();
-    }
-
-    @Override
-    public PutIndexedScriptRequestBuilder preparePutIndexedScript(final String scriptLang, final String id, final String source) {
-        return client.preparePutIndexedScript(scriptLang, id, source);
-    }
-
-    @Override
-    public void deleteIndexedScript(final DeleteIndexedScriptRequest request, final ActionListener<DeleteIndexedScriptResponse> listener) {
-        client.deleteIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<DeleteIndexedScriptResponse> deleteIndexedScript(final DeleteIndexedScriptRequest request) {
-        return client.deleteIndexedScript(request);
-    }
-
-    @Override
-    public DeleteIndexedScriptRequestBuilder prepareDeleteIndexedScript() {
-        return client.prepareDeleteIndexedScript();
-    }
-
-    @Override
-    public DeleteIndexedScriptRequestBuilder prepareDeleteIndexedScript(final String scriptLang, final String id) {
-        return client.prepareDeleteIndexedScript(scriptLang, id);
-    }
-
-    @Override
-    public void putIndexedScript(final PutIndexedScriptRequest request, final ActionListener<PutIndexedScriptResponse> listener) {
-        client.putIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<PutIndexedScriptResponse> putIndexedScript(final PutIndexedScriptRequest request) {
-        return client.putIndexedScript(request);
-    }
-
-    @Override
-    public GetIndexedScriptRequestBuilder prepareGetIndexedScript() {
-        return client.prepareGetIndexedScript();
-    }
-
-    @Override
-    public GetIndexedScriptRequestBuilder prepareGetIndexedScript(final String scriptLang, final String id) {
-        return client.prepareGetIndexedScript(scriptLang, id);
-    }
-
-    @Override
-    public void getIndexedScript(final GetIndexedScriptRequest request, final ActionListener<GetIndexedScriptResponse> listener) {
-        client.getIndexedScript(request, listener);
-    }
-
-    @Override
-    public ActionFuture<GetIndexedScriptResponse> getIndexedScript(final GetIndexedScriptRequest request) {
-        return client.getIndexedScript(request);
-    }
-
     @Override
     public ActionFuture<MultiGetResponse> multiGet(final MultiGetRequest request) {
         return client.multiGet(request);
@@ -1264,57 +1164,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiGet();
     }
 
-    @SuppressWarnings("deprecation")
-    @Override
-    public ActionFuture<CountResponse> count(final CountRequest request) {
-        return client.count(request);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void count(final CountRequest request, final ActionListener<CountResponse> listener) {
-        client.count(request, listener);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public CountRequestBuilder prepareCount(final String... indices) {
-        return client.prepareCount(indices);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ActionFuture<ExistsResponse> exists(final ExistsRequest request) {
-        return client.exists(request);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void exists(final ExistsRequest request, final ActionListener<ExistsResponse> listener) {
-        client.exists(request, listener);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public ExistsRequestBuilder prepareExists(final String... indices) {
-        return client.prepareExists(indices);
-    }
-
-    @Override
-    public ActionFuture<SuggestResponse> suggest(final SuggestRequest request) {
-        return client.suggest(request);
-    }
-
-    @Override
-    public void suggest(final SuggestRequest request, final ActionListener<SuggestResponse> listener) {
-        client.suggest(request, listener);
-    }
-
-    @Override
-    public SuggestRequestBuilder prepareSuggest(final String... indices) {
-        return client.prepareSuggest(indices);
-    }
-
     @Override
     public ActionFuture<SearchResponse> search(final SearchRequest request) {
         return client.search(request);
@@ -1360,36 +1209,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiSearch();
     }
 
-    @Override
-    public ActionFuture<PercolateResponse> percolate(final PercolateRequest request) {
-        return client.percolate(request);
-    }
-
-    @Override
-    public void percolate(final PercolateRequest request, final ActionListener<PercolateResponse> listener) {
-        client.percolate(request, listener);
-    }
-
-    @Override
-    public PercolateRequestBuilder preparePercolate() {
-        return client.preparePercolate();
-    }
-
-    @Override
-    public ActionFuture<MultiPercolateResponse> multiPercolate(final MultiPercolateRequest request) {
-        return client.multiPercolate(request);
-    }
-
-    @Override
-    public void multiPercolate(final MultiPercolateRequest request, final ActionListener<MultiPercolateResponse> listener) {
-        client.multiPercolate(request, listener);
-    }
-
-    @Override
-    public MultiPercolateRequestBuilder prepareMultiPercolate() {
-        return client.prepareMultiPercolate();
-    }
-
     @Override
     public ExplainRequestBuilder prepareExplain(final String index, final String type, final String id) {
         return client.prepareExplain(index, type, id);
@@ -1440,27 +1259,6 @@ public class FessEsClient implements Client {
         return client.settings();
     }
 
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request) {
-        return client.execute(action, request);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
-            final Action<Request, Response, RequestBuilder> action, final Request request, final ActionListener<Response> listener) {
-        client.execute(action, request, listener);
-    }
-
-    @SuppressWarnings("rawtypes")
-    @Override
-    public <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
-            final Action<Request, Response, RequestBuilder> action) {
-        return client.prepareExecute(action);
-    }
-
     @Override
     public ActionFuture<TermVectorsResponse> termVectors(final TermVectorsRequest request) {
         return client.termVectors(request);
@@ -1520,11 +1318,6 @@ public class FessEsClient implements Client {
         return client.prepareMultiTermVectors();
     }
 
-    @Override
-    public Headers headers() {
-        return client.headers();
-    }
-
     public void setSizeForDelete(final int sizeForDelete) {
         this.sizeForDelete = sizeForDelete;
     }
@@ -1533,4 +1326,27 @@ public class FessEsClient implements Client {
         this.scrollForDelete = scrollForDelete;
     }
 
+    @Override
+    public Client filterWithHeader(Map<String, String> headers) {
+        return client.filterWithHeader(headers);
+    }
+
+    @Override
+    public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> ActionFuture<Response> execute(
+            Action<Request, Response, RequestBuilder> action, Request request) {
+        return client.execute(action, request);
+    }
+
+    @Override
+    public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void execute(
+            Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
+        client.execute(action, request, listener);
+    }
+
+    @Override
+    public <Request extends ActionRequest<Request>, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> RequestBuilder prepareExecute(
+            Action<Request, Response, RequestBuilder> action) {
+        return client.prepareExecute(action);
+    }
+
 }
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
index 1aaa7279c07d8abe2188fb35dfd94875346bf7e4..614b2a886f56ec9c4b5aa6f8be81e25693c2778b 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractBehavior.java
@@ -39,6 +39,7 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -266,7 +267,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
 
         final IndexResponse response = builder.execute().actionGet(indexTimeout);
         esEntity.asDocMeta().id(response.getId());
-        return response.isCreated() ? 1 : 0;
+        return response.getResult() == Result.CREATED ? 1 : 0;
     }
 
     protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
@@ -315,7 +316,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final DeleteRequestBuilder builder = createDeleteRequest(esEntity);
 
         final DeleteResponse response = builder.execute().actionGet(deleteTimeout);
-        return response.isFound() ? 1 : 0;
+        return response.getResult() == Result.DELETED ? 1 : 0;
     }
 
     protected DeleteRequestBuilder createDeleteRequest(final EsAbstractEntity esEntity) {
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
index d82ad6f083290e09f85fe81d815b8734c98cdf15..2f363ec099166e678574a6c74d84aaa585dbaa60 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionAggregation.java
@@ -25,28 +25,28 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,148 +58,148 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationBuilderList;
+    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
 
     public boolean hasAggregations() {
-        return aggregationBuilderList != null && !aggregationBuilderList.isEmpty();
+        return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
     public List<AbstractAggregationBuilder> getAggregationBuilderList() {
-        return aggregationBuilderList != null ? aggregationBuilderList : Collections.emptyList();
+        return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
     // ===================================================================================
     //                                                                         Aggregation
     //                                                                               =====
-    public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-        assertObjectNotNull("aggregationBuilder", aggregationBuilder);
-        regA(aggregationBuilder);
+    public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) {
+        assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder);
+        regA(aggregationAggregationBuilder);
     }
 
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
 
-    protected AvgBuilder regAvgA(String name, String field) {
-        AvgBuilder builder = AggregationBuilders.avg(name).field(field);
+    protected AvgAggregationBuilder regAvgA(String name, String field) {
+        AvgAggregationBuilder builder = AggregationBuilders.avg(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MaxBuilder regMaxA(String name, String field) {
-        MaxBuilder builder = AggregationBuilders.max(name).field(field);
+    protected MaxAggregationBuilder regMaxA(String name, String field) {
+        MaxAggregationBuilder builder = AggregationBuilders.max(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MinBuilder regMinA(String name, String field) {
-        MinBuilder builder = AggregationBuilders.min(name).field(field);
+    protected MinAggregationBuilder regMinA(String name, String field) {
+        MinAggregationBuilder builder = AggregationBuilders.min(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SumBuilder regSumA(String name, String field) {
-        SumBuilder builder = AggregationBuilders.sum(name).field(field);
+    protected SumAggregationBuilder regSumA(String name, String field) {
+        SumAggregationBuilder builder = AggregationBuilders.sum(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ExtendedStatsBuilder regExtendedStatsA(String name, String field) {
-        ExtendedStatsBuilder builder = AggregationBuilders.extendedStats(name).field(field);
+    protected ExtendedStatsAggregationBuilder regExtendedStatsA(String name, String field) {
+        ExtendedStatsAggregationBuilder builder = AggregationBuilders.extendedStats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected StatsBuilder regStatsA(String name, String field) {
-        StatsBuilder builder = AggregationBuilders.stats(name).field(field);
+    protected StatsAggregationBuilder regStatsA(String name, String field) {
+        StatsAggregationBuilder builder = AggregationBuilders.stats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentilesBuilder regPercentilesA(String name, String field) {
-        PercentilesBuilder builder = AggregationBuilders.percentiles(name).field(field);
+    protected PercentilesAggregationBuilder regPercentilesA(String name, String field) {
+        PercentilesAggregationBuilder builder = AggregationBuilders.percentiles(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentileRanksBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected CardinalityBuilder regCardinalityA(String name, String field) {
-        CardinalityBuilder builder = AggregationBuilders.cardinality(name).field(field);
+    protected CardinalityAggregationBuilder regCardinalityA(String name, String field) {
+        CardinalityAggregationBuilder builder = AggregationBuilders.cardinality(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ValueCountBuilder regCountA(String name, String field) {
-        ValueCountBuilder builder = AggregationBuilders.count(name).field(field);
+    protected ValueCountAggregationBuilder regCountA(String name, String field) {
+        ValueCountAggregationBuilder builder = AggregationBuilders.count(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected TermsBuilder regTermsA(String name, String field) {
-        TermsBuilder builder = AggregationBuilders.terms(name).field(field);
+    protected TermsAggregationBuilder regTermsA(String name, String field) {
+        TermsAggregationBuilder builder = AggregationBuilders.terms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SignificantTermsBuilder regSignificantTermsA(String name, String field) {
-        SignificantTermsBuilder builder = AggregationBuilders.significantTerms(name).field(field);
+    protected SignificantTermsAggregationBuilder regSignificantTermsA(String name, String field) {
+        SignificantTermsAggregationBuilder builder = AggregationBuilders.significantTerms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected HistogramBuilder regHistogramA(String name, String field) {
-        HistogramBuilder builder = AggregationBuilders.histogram(name).field(field);
+    protected HistogramAggregationBuilder regHistogramA(String name, String field) {
+        HistogramAggregationBuilder builder = AggregationBuilders.histogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateHistogramBuilder regDateHistogramA(String name, String field) {
-        DateHistogramBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
+    protected DateHistogramAggregationBuilder regDateHistogramA(String name, String field) {
+        DateHistogramAggregationBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected RangeBuilder regRangeA(String name, String field) {
-        RangeBuilder builder = AggregationBuilders.range(name).field(field);
+    protected RangeAggregationBuilder regRangeA(String name, String field) {
+        RangeAggregationBuilder builder = AggregationBuilders.range(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateRangeBuilder regDateRangeA(String name, String field) {
-        DateRangeBuilder builder = AggregationBuilders.dateRange(name).field(field);
+    protected DateRangeAggregationBuilder regDateRangeA(String name, String field) {
+        DateRangeAggregationBuilder builder = AggregationBuilders.dateRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected IPv4RangeBuilder regIpRangeA(String name, String field) {
-        IPv4RangeBuilder builder = AggregationBuilders.ipRange(name).field(field);
+    protected IpRangeAggregationBuilder regIpRangeA(String name, String field) {
+        IpRangeAggregationBuilder builder = AggregationBuilders.ipRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MissingBuilder regMissingA(String name, String field) {
-        MissingBuilder builder = AggregationBuilders.missing(name).field(field);
+    protected MissingAggregationBuilder regMissingA(String name, String field) {
+        MissingAggregationBuilder builder = AggregationBuilders.missing(name).field(field);
         regA(builder);
         return builder;
     }
 
     protected FilterAggregationBuilder regFilterA(String name, QueryBuilder filter) {
-        FilterAggregationBuilder builder = AggregationBuilders.filter(name).filter(filter);
+        FilterAggregationBuilder builder = AggregationBuilders.filter(name, filter);
         regA(builder);
         return builder;
     }
 
-    protected GlobalBuilder regGlobalA(String name) {
-        GlobalBuilder builder = AggregationBuilders.global(name);
+    protected GlobalAggregationBuilder regGlobalA(String name) {
+        GlobalAggregationBuilder builder = AggregationBuilders.global(name);
         regA(builder);
         return builder;
     }
@@ -210,24 +210,24 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected ScriptedMetricBuilder regScriptedMetricA(String name) {
-        ScriptedMetricBuilder builder = AggregationBuilders.scriptedMetric(name);
+    protected ScriptedMetricAggregationBuilder regScriptedMetricA(String name) {
+        ScriptedMetricAggregationBuilder builder = AggregationBuilders.scriptedMetric(name);
         regA(builder);
         return builder;
     }
 
-    protected TopHitsBuilder regTopHitsA(String name) {
-        TopHitsBuilder builder = AggregationBuilders.topHits(name);
+    protected TopHitsAggregationBuilder regTopHitsA(String name) {
+        TopHitsAggregationBuilder builder = AggregationBuilders.topHits(name);
         regA(builder);
         return builder;
     }
 
     protected void regA(AbstractAggregationBuilder builder) {
         assertObjectNotNull("builder", builder);
-        if (aggregationBuilderList == null) {
-            aggregationBuilderList = new ArrayList<>();
+        if (aggregationAggregationBuilderList == null) {
+            aggregationAggregationBuilderList = new ArrayList<>();
         }
-        aggregationBuilderList.add(builder);
+        aggregationAggregationBuilderList.add(builder);
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
index bea16d12df70275f885d4d5b4de6b84e9fadfa6b..2dedb885622db67db63af0fb17e25983775b1b2d 100644
--- a/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/config/allcommon/EsAbstractConditionQuery.java
@@ -15,10 +15,16 @@
  */
 package org.codelibs.fess.es.config.allcommon;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
@@ -32,12 +38,14 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -46,10 +54,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
@@ -152,8 +162,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     //                                                                            Register
     //                                                                            ========
 
-    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder) {
-        FunctionScoreQueryBuilder functionScoreQuery = QueryBuilders.functionScoreQuery(queryBuilder);
+    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder, Collection<FilterFunctionBuilder> list) {
+        FunctionScoreQueryBuilder functionScoreQuery =
+                QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
         regQ(functionScoreQuery);
         return functionScoreQuery;
     }
@@ -197,7 +208,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     protected IdsQueryBuilder regIdsQ(Collection<String> values) {
         checkEsInvalidQueryCollection("_id", values);
-        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values.toArray(new String[values.size()]));
         regQ(idsQuery);
         return idsQuery;
     }
@@ -209,23 +220,23 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhraseQ(String name, Object value) {
+    protected MatchPhraseQueryBuilder regMatchPhraseQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
+        MatchPhraseQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
+    protected MatchPhrasePrefixQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
+        MatchPhrasePrefixQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected FuzzyQueryBuilder regFuzzyQ(String name, Object value) {
+    protected MatchQueryBuilder regFuzzyQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        FuzzyQueryBuilder fuzzyQuery = QueryBuilders.fuzzyQuery(name, value);
+        MatchQueryBuilder fuzzyQuery = QueryBuilders.matchQuery(name, value).fuzziness(Fuzziness.AUTO);
         regQ(fuzzyQuery);
         return fuzzyQuery;
     }
@@ -297,12 +308,19 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return commonTermsQuery;
     }
 
-    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name) {
-        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(name);
+    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name, String[] likeTexts) {
+        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(new String[] { name }, likeTexts, null);
         regQ(moreLikeThisQuery);
         return moreLikeThisQuery;
     }
 
+    protected SpanTermQueryBuilder regSpanTermQ(String name, String value) {
+        checkEsInvalidQuery(name, value);
+        SpanTermQueryBuilder spanTermQuery = QueryBuilders.spanTermQuery(name, value);
+        regQ(spanTermQuery);
+        return spanTermQuery;
+    }
+
     protected void regQ(QueryBuilder builder) {
         assertObjectNotNull("builder", builder);
         if (queryBuilderList == null) {
@@ -488,6 +506,28 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         }
     }
 
+    protected String toRangeDateString(Date date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.getTime());
+        } else if (format.contains("date_optional_time")) {
+            final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            return sdf.format(date);
+        } else {
+            return Long.toString(date.getTime());
+        }
+    }
+
+    protected String toRangeLocalDateTimeString(LocalDateTime date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        } else if (format.contains("date_optional_time")) {
+            return DateTimeFormatter.ISO_DATE_TIME.format(date);
+        } else {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        }
+    }
+
     // ===================================================================================
     //                                                                        Assist Class
     //                                                                        ============
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
index 3cc7151373e97f049b77c5166eacde668549e8f5..d2b338e5abe05c8b87a1c10de7ea0cc25ff4f2d7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/AccessTokenDbm.java
@@ -131,22 +131,22 @@ public class AccessTokenDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnToken = cci("token", "token", null, null, String.class, "token", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameterName = cci("parameter_name", "parameter_name", null, null, String.class, "parameterName",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
index ecba55f09bcd3ae0c18039440a62ebe83db95a4e..078091147e0a10d2986204f6e25d5e5a628f003f 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BadWordDbm.java
@@ -130,17 +130,17 @@ public class BadWordDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
index b993385bd7842beed9c4534cd2073b72c336d179..6abd7f46d6355a314bc7e2be444ebc9a028d7455 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/BoostDocumentRuleDbm.java
@@ -130,19 +130,19 @@ public class BoostDocumentRuleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnBoostExpr = cci("boostExpr", "boostExpr", null, null, String.class, "boostExpr", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUrlExpr = cci("urlExpr", "urlExpr", null, null, String.class, "urlExpr", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnBoostExpr() {
         return _columnBoostExpr;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
index 1ae7926c647ed63048ee1180d44adb81e6f53a9c..b043ebc889e53f7ed469a01daf48f0cf7c028f1c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoDbm.java
@@ -126,10 +126,10 @@ public class CrawlingInfoDbm extends AbstractDBMeta {
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExpiredTime = cci("expiredTime", "expiredTime", null, null, Long.class, "expiredTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSessionId = cci("sessionId", "sessionId", null, null, String.class, "sessionId", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedTime() {
         return _columnCreatedTime;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
index 6c13902800c008b9157a8cb68874c1917896b4e6..cd0967dab3169f8d00dba243aa4c2c089ba1e779 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/CrawlingInfoParamDbm.java
@@ -124,13 +124,13 @@ public class CrawlingInfoParamDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCrawlingInfoId = cci("crawlingInfoId", "crawlingInfoId", null, null, String.class, "crawlingInfoId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "String", 0, 0,
+    protected final ColumnInfo _columnKey = cci("key", "key", null, null, String.class, "key", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCrawlingInfoId() {
         return _columnCrawlingInfoId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
index 4bbaf121201290e00268fc1db8c9d0d4997d42bd..3c62eb39d5b4d802abf2a02f5ae6385988498b4e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigDbm.java
@@ -142,23 +142,23 @@ public class DataConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHandlerName = cci("handlerName", "handlerName", null, null, String.class, "handlerName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHandlerParameter = cci("handlerParameter", "handlerParameter", null, null, String.class,
-            "handlerParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "handlerParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHandlerScript = cci("handlerScript", "handlerScript", null, null, String.class, "handlerScript",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
index 0c26ae1d705bc9119592c482edcb1263ec2378f8..513f014cbc9bcced4ed5799f2b7c272f824c8d57 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToLabelDbm.java
@@ -120,9 +120,9 @@ public class DataConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnDataConfigId() {
         return _columnDataConfigId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
index 89ed4571b2c27b4f3c75f3a572363404fdf37b11..7705648d567eb0594918400a4286f88260285e34 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DataConfigToRoleDbm.java
@@ -120,9 +120,9 @@ public class DataConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnDataConfigId = cci("dataConfigId", "dataConfigId", null, null, String.class, "dataConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnDataConfigId() {
         return _columnDataConfigId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
index 4f7c24cec78a05f390a85b97a05197ca82e41556..9f387dee9194297234390e8e5e148bd2d55c6d2a 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/DuplicateHostDbm.java
@@ -130,17 +130,17 @@ public class DuplicateHostDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDuplicateHostName = cci("duplicateHostName", "duplicateHostName", null, null, String.class,
-            "duplicateHostName", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "duplicateHostName", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegularName = cci("regularName", "regularName", null, null, String.class, "regularName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
index 7ab586aaef8c8b82520144a9af2ced4dba089b08..a5e245a3cc4e4cc4f491470dba5e4cb2c80ea1c7 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordDbm.java
@@ -137,21 +137,21 @@ public class ElevateWordDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReading = cci("reading", "reading", null, null, String.class, "reading", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSuggestWord = cci("suggestWord", "suggestWord", null, null, String.class, "suggestWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetLabel = cci("targetLabel", "targetLabel", null, null, String.class, "targetLabel", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTargetRole = cci("targetRole", "targetRole", null, null, String.class, "targetRole", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
index 86212f72547a8dfb3023501e6b37a040356a20d3..40c97eb7f9882c78593ec4a3cedb9ec18723e735 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ElevateWordToLabelDbm.java
@@ -120,9 +120,9 @@ public class ElevateWordToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnElevateWordId = cci("elevateWordId", "elevateWordId", null, null, String.class, "elevateWordId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnElevateWordId() {
         return _columnElevateWordId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
index 7bd7eef219a55f2d8286ddb06e66052785674d99..a7c2e9435c100d8aa68bedef9edd8eb4909a424b 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FailureUrlDbm.java
@@ -129,18 +129,18 @@ public class FailureUrlDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnConfigId = cci("configId", "configId", null, null, String.class, "configId", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorCount = cci("errorCount", "errorCount", null, null, Integer.class, "errorCount", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorLog = cci("errorLog", "errorLog", null, null, String.class, "errorLog", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnErrorName = cci("errorName", "errorName", null, null, String.class, "errorName", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLastAccessTime = cci("lastAccessTime", "lastAccessTime", null, null, Long.class, "lastAccessTime",
             null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnThreadName = cci("threadName", "threadName", null, null, String.class, "threadName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnConfigId() {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
index 5ec6d77019416dba7e39a9dea5e3465b737b2804..ed5661276349810f8a212f164c6312041de17502 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileAuthenticationDbm.java
@@ -138,27 +138,27 @@ public class FileAuthenticationDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
index 480aad5720e33057c305327f1ccfb06a618f8af1..3eff90e12e39b8ca42d95b9edd6440bfa8bf321e 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigDbm.java
@@ -156,39 +156,39 @@ public class FileConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
-            "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedDocPaths = cci("excludedDocPaths", "excludedDocPaths", null, null, String.class,
-            "excludedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "excludedDocPaths", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedDocPaths = cci("includedDocPaths", "includedDocPaths", null, null, String.class,
-            "includedDocPaths", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "includedDocPaths", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
             null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPaths = cci("paths", "paths", null, null, String.class, "paths", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
index 23b76d16495152e440c25967582e7eb5810dbf8a..eca9b2811cf40baccebbe29a846f050d23a454b9 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToLabelDbm.java
@@ -120,9 +120,9 @@ public class FileConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnFileConfigId() {
         return _columnFileConfigId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
index e854738b0673b87835c821c72f064032be590c87..7ab557e6fdd8c52eebb097d8da6ffd139a89ec2d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/FileConfigToRoleDbm.java
@@ -120,9 +120,9 @@ public class FileConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnFileConfigId = cci("fileConfigId", "fileConfigId", null, null, String.class, "fileConfigId", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnFileConfigId() {
         return _columnFileConfigId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
index 157a3cb6cf6ab1562c3a42610c238844106d5b0c..a4a11c375d52a29f1cdd289026299668cfd2e19c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/JobLogDbm.java
@@ -131,19 +131,19 @@ public class JobLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnEndTime = cci("endTime", "endTime", null, null, Long.class, "endTime", null, false, false, false,
             "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobName = cci("jobName", "jobName", null, null, String.class, "jobName", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobStatus = cci("jobStatus", "jobStatus", null, null, String.class, "jobStatus", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptResult = cci("scriptResult", "scriptResult", null, null, String.class, "scriptResult", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnStartTime = cci("startTime", "startTime", null, null, Long.class, "startTime", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLastUpdated = cci("lastUpdated", "lastUpdated", null, null, Long.class, "lastUpdated", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
index f1b2808c0853eab52dfdf4dbedb873ae563452cb..cfb48dbeb5f0d90530aa9a1a6486d88014a19d10 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/KeyMatchDbm.java
@@ -130,17 +130,17 @@ public class KeyMatchDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxSize = cci("maxSize", "maxSize", null, null, Integer.class, "maxSize", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnQuery = cci("query", "query", null, null, String.class, "query", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTerm = cci("term", "term", null, null, String.class, "term", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
index cd15170c647d2341119c713294b9ff87ded64ead..7594a5619f9f59cd46e8143dfd01b659af4d18cc 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelToRoleDbm.java
@@ -120,9 +120,9 @@ public class LabelToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
index 31e3c01f6c87b24f64b7acbf030517b7cdc271f7..dab5cea2f9426d07394cd766c08181f60fd72b62 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/LabelTypeDbm.java
@@ -134,25 +134,25 @@ public class LabelTypeDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedPaths = cci("excludedPaths", "excludedPaths", null, null, String.class, "excludedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedPaths = cci("includedPaths", "includedPaths", null, null, String.class, "includedPaths",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
index cca3c4d4084823041079466c37c65b0f88f59597..39e94b9f1281a13e0059aced598572f7847e8adb 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/PathMappingDbm.java
@@ -133,21 +133,21 @@ public class PathMappingDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProcessType = cci("processType", "processType", null, null, String.class, "processType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnRegex = cci("regex", "regex", null, null, String.class, "regex", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReplacement = cci("replacement", "replacement", null, null, String.class, "replacement", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
index 10a5bf61985242eeee25500014792c13eb4fa838..504024338f06475092d83be3fc1116eff340a1e1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RequestHeaderDbm.java
@@ -129,19 +129,19 @@ public class RequestHeaderDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
index b533925a2cf925dd6c45daf7a82210373bd2366e..07a61d17235508e12888e0812b3415fd5618d697 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/RoleTypeDbm.java
@@ -128,19 +128,19 @@ public class RoleTypeDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
         return _columnCreatedBy;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
index 8eb8b1445ebeb7f6ca1d438fddfc2cb62c9b186d..825f901354531b07f0f5ce898940b422fe2a24e1 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ScheduledJobDbm.java
@@ -145,25 +145,25 @@ public class ScheduledJobDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnCrawler = cci("crawler", "crawler", null, null, Boolean.class, "crawler", null, false, false, false,
             "Boolean", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCronExpression = cci("cronExpression", "cronExpression", null, null, String.class, "cronExpression",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnJobLogging = cci("jobLogging", "jobLogging", null, null, Boolean.class, "jobLogging", null, false,
             false, false, "Boolean", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptData = cci("scriptData", "scriptData", null, null, String.class, "scriptData", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnScriptType = cci("scriptType", "scriptType", null, null, String.class, "scriptType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
 
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
index b34a55fc9474e9e8ce88342c601dba5e83795120..445240d1f6b82905002be1b67f12616f252c0e65 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/ThumbnailQueueDbm.java
@@ -126,16 +126,16 @@ public class ThumbnailQueueDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTarget = cci("target", "target", null, null, String.class, "target", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGenerator = cci("generator", "generator", null, null, String.class, "generator", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "String", 0,
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPath = cci("path", "path", null, null, String.class, "path", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
+    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedBy() {
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
index 17630cdedc4ba94cfe3d068e7cb3538586071f0c..32b1d0050c195e89ba3e18f4e8ee7a04f0f67c9c 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebAuthenticationDbm.java
@@ -140,29 +140,29 @@ public class WebAuthenticationDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnAuthRealm = cci("authRealm", "authRealm", null, null, String.class, "authRealm", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHostname = cci("hostname", "hostname", null, null, String.class, "hostname", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnParameters = cci("parameters", "parameters", null, null, String.class, "parameters", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPort = cci("port", "port", null, null, Integer.class, "port", null, false, false, false, "Integer",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnProtocolScheme = cci("protocolScheme", "protocolScheme", null, null, String.class, "protocolScheme",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUsername = cci("username", "username", null, null, String.class, "username", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnAuthRealm() {
         return _columnAuthRealm;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
index eb3af726099cf1406f0dfe2579efea1d89521c7c..d1b67a4e518e8d73f79a2406f84ad61f9b7b4c07 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigDbm.java
@@ -158,43 +158,43 @@ public class WebConfigDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnBoost = cci("boost", "boost", null, null, Float.class, "boost", null, false, false, false, "Float",
             0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnConfigParameter = cci("configParameter", "configParameter", null, null, String.class,
-            "configParameter", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "configParameter", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedBy = cci("createdBy", "createdBy", null, null, String.class, "createdBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCreatedTime = cci("createdTime", "createdTime", null, null, Long.class, "createdTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDepth = cci("depth", "depth", null, null, Integer.class, "depth", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedDocUrls = cci("excludedDocUrls", "excludedDocUrls", null, null, String.class,
-            "excludedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "excludedDocUrls", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnExcludedUrls = cci("excludedUrls", "excludedUrls", null, null, String.class, "excludedUrls", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedDocUrls = cci("includedDocUrls", "includedDocUrls", null, null, String.class,
-            "includedDocUrls", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "includedDocUrls", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIncludedUrls = cci("includedUrls", "includedUrls", null, null, String.class, "includedUrls", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnIntervalTime = cci("intervalTime", "intervalTime", null, null, Integer.class, "intervalTime", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTimeToLive = cci("timeToLive", "timeToLive", null, null, Integer.class, "timeToLive", null, false,
             false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMaxAccessCount = cci("maxAccessCount", "maxAccessCount", null, null, Long.class, "maxAccessCount",
             null, false, false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnNumOfThread = cci("numOfThread", "numOfThread", null, null, Integer.class, "numOfThread", null,
             false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPermissions = cci("permissions", "permissions", null, null, String[].class, "permissions", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSortOrder = cci("sortOrder", "sortOrder", null, null, Integer.class, "sortOrder", null, false, false,
             false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedBy = cci("updatedBy", "updatedBy", null, null, String.class, "updatedBy", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUpdatedTime = cci("updatedTime", "updatedTime", null, null, Long.class, "updatedTime", null, false,
             false, false, "Long", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnUrls = cci("urls", "urls", null, null, String.class, "urls", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnAvailable() {
         return _columnAvailable;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
index 64a164bd40856434c6b033bea92ba48e0727894a..695a774b13fa44405d1e6a6c3a0098b47bf994dd 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToLabelDbm.java
@@ -120,9 +120,9 @@ public class WebConfigToLabelDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnLabelTypeId = cci("labelTypeId", "labelTypeId", null, null, String.class, "labelTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnLabelTypeId() {
         return _columnLabelTypeId;
diff --git a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
index 9572cb2299ac726cb802c3d6da964b5e1722862e..df5280fc957d80696e048d912916b28dbb58879d 100644
--- a/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/config/bsentity/dbmeta/WebConfigToRoleDbm.java
@@ -120,9 +120,9 @@ public class WebConfigToRoleDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnRoleTypeId = cci("roleTypeId", "roleTypeId", null, null, String.class, "roleTypeId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnWebConfigId = cci("webConfigId", "webConfigId", null, null, String.class, "webConfigId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnRoleTypeId() {
         return _columnRoleTypeId;
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
index 8f42e330e7bcdd46296896a2b1d9ca940417bdff..1d1af6367e20d35e959d0c4e44825ac92df28a78 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsAccessTokenCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.AccessTokenCA;
 import org.codelibs.fess.es.config.cbean.cq.AccessTokenCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsAccessTokenCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,34 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +134,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +160,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +185,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +200,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +215,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,22 +236,20 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String token
-
     public void setToken_Terms() {
         setToken_Terms(null);
     }
 
-    public void setToken_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setToken_Terms("token", opLambda, null);
     }
 
-    public void setToken_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setToken_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setToken_Terms("token", opLambda, aggsLambda);
     }
 
-    public void setToken_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "token");
+    public void setToken_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -265,17 +264,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setToken_SignificantTerms(null);
     }
 
-    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setToken_SignificantTerms("token", opLambda, null);
     }
 
-    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setToken_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
         setToken_SignificantTerms("token", opLambda, aggsLambda);
     }
 
-    public void setToken_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setToken_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "token");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -290,16 +290,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setToken_IpRange(null);
     }
 
-    public void setToken_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setToken_IpRange("token", opLambda, null);
     }
 
-    public void setToken_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setToken_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setToken_IpRange("token", opLambda, aggsLambda);
     }
 
-    public void setToken_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "token");
+    public void setToken_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -314,12 +315,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setToken_Count(null);
     }
 
-    public void setToken_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setToken_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setToken_Count("token", opLambda);
     }
 
-    public void setToken_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "token");
+    public void setToken_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,12 +330,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setToken_Cardinality(null);
     }
 
-    public void setToken_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setToken_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setToken_Cardinality("token", opLambda);
     }
 
-    public void setToken_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "token");
+    public void setToken_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -344,16 +345,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setToken_Missing(null);
     }
 
-    public void setToken_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setToken_Missing("token", opLambda, null);
     }
 
-    public void setToken_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setToken_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setToken_Missing("token", opLambda, aggsLambda);
     }
 
-    public void setToken_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "token");
+    public void setToken_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "token");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,22 +366,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -394,18 +395,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -420,16 +421,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -444,12 +446,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -459,12 +461,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -474,16 +476,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -494,22 +497,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String parameter_name
-
     public void setParameterName_Terms() {
         setParameterName_Terms(null);
     }
 
-    public void setParameterName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setParameterName_Terms("parameter_name", opLambda, null);
     }
 
-    public void setParameterName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setParameterName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setParameterName_Terms("parameter_name", opLambda, aggsLambda);
     }
 
-    public void setParameterName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "parameter_name");
+    public void setParameterName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,18 +526,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setParameterName_SignificantTerms(null);
     }
 
-    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setParameterName_SignificantTerms("parameter_name", opLambda, null);
     }
 
-    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameterName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
         setParameterName_SignificantTerms("parameter_name", opLambda, aggsLambda);
     }
 
-    public void setParameterName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameterName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "parameter_name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -550,17 +552,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setParameterName_IpRange(null);
     }
 
-    public void setParameterName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setParameterName_IpRange("parameter_name", opLambda, null);
     }
 
-    public void setParameterName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setParameterName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setParameterName_IpRange("parameter_name", opLambda, aggsLambda);
     }
 
-    public void setParameterName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setParameterName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "parameter_name");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -575,12 +577,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setParameterName_Count(null);
     }
 
-    public void setParameterName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setParameterName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setParameterName_Count("parameter_name", opLambda);
     }
 
-    public void setParameterName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "parameter_name");
+    public void setParameterName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -590,12 +592,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setParameterName_Cardinality(null);
     }
 
-    public void setParameterName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setParameterName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setParameterName_Cardinality("parameter_name", opLambda);
     }
 
-    public void setParameterName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "parameter_name");
+    public void setParameterName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -605,16 +607,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setParameterName_Missing(null);
     }
 
-    public void setParameterName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setParameterName_Missing("parameter_name", opLambda, null);
     }
 
-    public void setParameterName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setParameterName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setParameterName_Missing("parameter_name", opLambda, aggsLambda);
     }
 
-    public void setParameterName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "parameter_name");
+    public void setParameterName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "parameter_name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -625,17 +628,16 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long expiredTime
     public void setExpiredTime_Avg() {
         setExpiredTime_Avg(null);
     }
 
-    public void setExpiredTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setExpiredTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setExpiredTime_Avg("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "expiredTime");
+    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -645,12 +647,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Max(null);
     }
 
-    public void setExpiredTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setExpiredTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setExpiredTime_Max("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "expiredTime");
+    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +662,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Min(null);
     }
 
-    public void setExpiredTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setExpiredTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setExpiredTime_Min("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "expiredTime");
+    public void setExpiredTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,12 +677,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Sum(null);
     }
 
-    public void setExpiredTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setExpiredTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setExpiredTime_Sum("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "expiredTime");
+    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -690,12 +692,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_ExtendedStats(null);
     }
 
-    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setExpiredTime_ExtendedStats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "expiredTime");
+    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -705,12 +707,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Stats(null);
     }
 
-    public void setExpiredTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setExpiredTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setExpiredTime_Stats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "expiredTime");
+    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,12 +722,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Percentiles(null);
     }
 
-    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setExpiredTime_Percentiles("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "expiredTime");
+    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -735,12 +737,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_PercentileRanks(null);
     }
 
-    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setExpiredTime_PercentileRanks("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "expiredTime");
+    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -750,17 +752,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Histogram(null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "expiredTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -775,16 +777,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Range(null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setExpiredTime_Range("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setExpiredTime_Range("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "expiredTime");
+    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -799,12 +802,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Count(null);
     }
 
-    public void setExpiredTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExpiredTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExpiredTime_Count("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "expiredTime");
+    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -814,12 +817,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Cardinality(null);
     }
 
-    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExpiredTime_Cardinality("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "expiredTime");
+    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -829,16 +832,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setExpiredTime_Missing(null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "expiredTime");
+    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,22 +853,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -879,18 +882,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,16 +908,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -929,12 +933,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -944,12 +948,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,16 +963,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -979,17 +984,16 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -999,12 +1003,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1014,12 +1018,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1029,12 +1033,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1044,12 +1048,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1059,12 +1063,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1074,12 +1078,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,12 +1093,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1104,17 +1108,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1129,16 +1133,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1153,12 +1158,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1168,12 +1173,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1183,16 +1188,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1203,22 +1209,21 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1233,18 +1238,18 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1259,16 +1264,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1283,12 +1289,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1298,12 +1304,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1313,16 +1319,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1333,17 +1340,16 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1353,12 +1359,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1368,12 +1374,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1383,12 +1389,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1398,12 +1404,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1413,12 +1419,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1428,12 +1434,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1443,12 +1449,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1458,17 +1464,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsAccessTokenCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1483,16 +1489,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1507,12 +1514,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1522,12 +1529,12 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1537,16 +1544,17 @@ public abstract class BsAccessTokenCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsAccessTokenCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsAccessTokenCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
index d40301316e4d7e85ed45b866510fae77dbbd7435..df95298a9308617ab71206b6e0a5af731420a899 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBadWordCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.BadWordCA;
 import org.codelibs.fess.es.config.cbean.cq.BadWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBadWordCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,34 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +134,18 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBadWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +160,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +185,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +200,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +215,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,17 +236,16 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +255,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +270,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,12 +285,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -300,12 +300,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -315,12 +315,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,12 +330,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -345,12 +345,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -360,16 +360,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +385,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +410,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +425,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +440,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,22 +461,21 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String suggestWord
-
     public void setSuggestWord_Terms() {
         setSuggestWord_Terms(null);
     }
 
-    public void setSuggestWord_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSuggestWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSuggestWord_Terms("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setSuggestWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setSuggestWord_Terms("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "suggestWord");
+    public void setSuggestWord_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,17 +490,18 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_SignificantTerms(null);
     }
 
-    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSuggestWord_SignificantTerms("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
         setSuggestWord_SignificantTerms("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSuggestWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBadWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "suggestWord");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,16 +516,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_IpRange(null);
     }
 
-    public void setSuggestWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSuggestWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSuggestWord_IpRange("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setSuggestWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setSuggestWord_IpRange("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "suggestWord");
+    public void setSuggestWord_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -537,12 +541,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Count(null);
     }
 
-    public void setSuggestWord_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSuggestWord_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSuggestWord_Count("suggestWord", opLambda);
     }
 
-    public void setSuggestWord_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "suggestWord");
+    public void setSuggestWord_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,12 +556,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Cardinality(null);
     }
 
-    public void setSuggestWord_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSuggestWord_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSuggestWord_Cardinality("suggestWord", opLambda);
     }
 
-    public void setSuggestWord_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "suggestWord");
+    public void setSuggestWord_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -567,16 +571,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Missing(null);
     }
 
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSuggestWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSuggestWord_Missing("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setSuggestWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setSuggestWord_Missing("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "suggestWord");
+    public void setSuggestWord_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,22 +592,21 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String targetLabel
-
     public void setTargetLabel_Terms() {
         setTargetLabel_Terms(null);
     }
 
-    public void setTargetLabel_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTargetLabel_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTargetLabel_Terms("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetLabel_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetLabel_Terms("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "targetLabel");
+    public void setTargetLabel_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -617,17 +621,18 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_SignificantTerms(null);
     }
 
-    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTargetLabel_SignificantTerms("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetLabel_SignificantTerms("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetLabel_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBadWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "targetLabel");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,16 +647,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_IpRange(null);
     }
 
-    public void setTargetLabel_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTargetLabel_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTargetLabel_IpRange("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetLabel_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetLabel_IpRange("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "targetLabel");
+    public void setTargetLabel_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -666,12 +672,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Count(null);
     }
 
-    public void setTargetLabel_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTargetLabel_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTargetLabel_Count("targetLabel", opLambda);
     }
 
-    public void setTargetLabel_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "targetLabel");
+    public void setTargetLabel_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -681,12 +687,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Cardinality(null);
     }
 
-    public void setTargetLabel_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTargetLabel_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTargetLabel_Cardinality("targetLabel", opLambda);
     }
 
-    public void setTargetLabel_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "targetLabel");
+    public void setTargetLabel_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -696,16 +702,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Missing(null);
     }
 
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTargetLabel_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTargetLabel_Missing("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetLabel_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetLabel_Missing("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "targetLabel");
+    public void setTargetLabel_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,22 +723,20 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String targetRole
-
     public void setTargetRole_Terms() {
         setTargetRole_Terms(null);
     }
 
-    public void setTargetRole_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTargetRole_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTargetRole_Terms("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetRole_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetRole_Terms("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "targetRole");
+    public void setTargetRole_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -746,17 +751,18 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetRole_SignificantTerms(null);
     }
 
-    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTargetRole_SignificantTerms("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetRole_SignificantTerms("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetRole_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBadWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "targetRole");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -771,16 +777,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetRole_IpRange(null);
     }
 
-    public void setTargetRole_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTargetRole_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTargetRole_IpRange("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetRole_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetRole_IpRange("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "targetRole");
+    public void setTargetRole_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -795,12 +802,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Count(null);
     }
 
-    public void setTargetRole_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTargetRole_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTargetRole_Count("targetRole", opLambda);
     }
 
-    public void setTargetRole_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "targetRole");
+    public void setTargetRole_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -810,12 +817,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Cardinality(null);
     }
 
-    public void setTargetRole_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTargetRole_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTargetRole_Cardinality("targetRole", opLambda);
     }
 
-    public void setTargetRole_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "targetRole");
+    public void setTargetRole_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -825,16 +832,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Missing(null);
     }
 
-    public void setTargetRole_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTargetRole_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTargetRole_Missing("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setTargetRole_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setTargetRole_Missing("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "targetRole");
+    public void setTargetRole_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -845,22 +853,20 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -875,17 +881,18 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBadWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,16 +907,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -924,12 +932,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,12 +947,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -954,16 +962,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -974,17 +983,16 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -994,12 +1002,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1009,12 +1017,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1024,12 +1032,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1039,12 +1047,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1054,12 +1062,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1069,12 +1077,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1084,12 +1092,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1099,16 +1107,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,16 +1132,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1147,12 +1157,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1162,12 +1172,12 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1177,16 +1187,17 @@ public abstract class BsBadWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBadWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBadWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
index d7c9cf815a73102b5d7a8f7d51438fac259230e7..b490a81eb30a4f2643e79a89c5d5081d66834bb3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsBoostDocumentRuleCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.BoostDocumentRuleCA;
 import org.codelibs.fess.es.config.cbean.cq.BoostDocumentRuleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsBoostDocumentRuleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String boostExpr
-
     public void setBoostExpr_Terms() {
         setBoostExpr_Terms(null);
     }
 
-    public void setBoostExpr_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setBoostExpr_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setBoostExpr_Terms("boostExpr", opLambda, null);
     }
 
-    public void setBoostExpr_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setBoostExpr_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setBoostExpr_Terms("boostExpr", opLambda, aggsLambda);
     }
 
-    public void setBoostExpr_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "boostExpr");
+    public void setBoostExpr_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setBoostExpr_SignificantTerms(null);
     }
 
-    public void setBoostExpr_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setBoostExpr_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setBoostExpr_SignificantTerms("boostExpr", opLambda, null);
     }
 
-    public void setBoostExpr_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setBoostExpr_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setBoostExpr_SignificantTerms("boostExpr", opLambda, aggsLambda);
     }
 
-    public void setBoostExpr_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setBoostExpr_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "boostExpr");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,17 +161,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setBoostExpr_IpRange(null);
     }
 
-    public void setBoostExpr_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setBoostExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setBoostExpr_IpRange("boostExpr", opLambda, null);
     }
 
-    public void setBoostExpr_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setBoostExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setBoostExpr_IpRange("boostExpr", opLambda, aggsLambda);
     }
 
-    public void setBoostExpr_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setBoostExpr_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "boostExpr");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -187,12 +186,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setBoostExpr_Count(null);
     }
 
-    public void setBoostExpr_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoostExpr_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoostExpr_Count("boostExpr", opLambda);
     }
 
-    public void setBoostExpr_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boostExpr");
+    public void setBoostExpr_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -202,12 +201,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setBoostExpr_Cardinality(null);
     }
 
-    public void setBoostExpr_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoostExpr_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoostExpr_Cardinality("boostExpr", opLambda);
     }
 
-    public void setBoostExpr_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boostExpr");
+    public void setBoostExpr_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -217,17 +216,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setBoostExpr_Missing(null);
     }
 
-    public void setBoostExpr_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoostExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoostExpr_Missing("boostExpr", opLambda, null);
     }
 
-    public void setBoostExpr_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setBoostExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setBoostExpr_Missing("boostExpr", opLambda, aggsLambda);
     }
 
-    public void setBoostExpr_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setBoostExpr_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boostExpr");
+        MissingAggregationBuilder builder = regMissingA(name, "boostExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -238,22 +237,21 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -268,18 +266,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,17 +292,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,12 +317,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -334,12 +332,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,17 +347,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -370,17 +368,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -390,12 +387,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -405,12 +402,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -420,12 +417,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,12 +432,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -450,12 +447,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -465,12 +462,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,12 +477,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -495,17 +492,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,16 +518,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -544,12 +543,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -559,12 +558,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -574,17 +573,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -595,17 +595,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -615,12 +614,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,12 +629,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -645,12 +644,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +659,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,12 +674,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -690,12 +689,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -705,12 +704,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,17 +719,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -745,16 +745,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -769,12 +770,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -784,12 +785,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -799,17 +800,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -820,22 +821,21 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,18 +850,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -876,17 +876,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -901,12 +901,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,12 +916,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -931,17 +931,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -952,17 +952,16 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -972,12 +971,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -987,12 +986,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1002,12 +1001,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1017,12 +1016,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1032,12 +1031,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1047,12 +1046,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1062,12 +1061,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1077,17 +1076,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,16 +1102,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1126,12 +1127,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1141,12 +1142,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1156,17 +1157,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1177,22 +1179,21 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String urlExpr
-
     public void setUrlExpr_Terms() {
         setUrlExpr_Terms(null);
     }
 
-    public void setUrlExpr_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrlExpr_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrlExpr_Terms("urlExpr", opLambda, null);
     }
 
-    public void setUrlExpr_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUrlExpr_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUrlExpr_Terms("urlExpr", opLambda, aggsLambda);
     }
 
-    public void setUrlExpr_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "urlExpr");
+    public void setUrlExpr_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1207,18 +1208,18 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUrlExpr_SignificantTerms(null);
     }
 
-    public void setUrlExpr_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrlExpr_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrlExpr_SignificantTerms("urlExpr", opLambda, null);
     }
 
-    public void setUrlExpr_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrlExpr_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUrlExpr_SignificantTerms("urlExpr", opLambda, aggsLambda);
     }
 
-    public void setUrlExpr_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrlExpr_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "urlExpr");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1233,17 +1234,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUrlExpr_IpRange(null);
     }
 
-    public void setUrlExpr_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrlExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrlExpr_IpRange("urlExpr", opLambda, null);
     }
 
-    public void setUrlExpr_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUrlExpr_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUrlExpr_IpRange("urlExpr", opLambda, aggsLambda);
     }
 
-    public void setUrlExpr_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUrlExpr_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "urlExpr");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1258,12 +1259,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUrlExpr_Count(null);
     }
 
-    public void setUrlExpr_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrlExpr_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrlExpr_Count("urlExpr", opLambda);
     }
 
-    public void setUrlExpr_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "urlExpr");
+    public void setUrlExpr_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1273,12 +1274,12 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUrlExpr_Cardinality(null);
     }
 
-    public void setUrlExpr_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrlExpr_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrlExpr_Cardinality("urlExpr", opLambda);
     }
 
-    public void setUrlExpr_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "urlExpr");
+    public void setUrlExpr_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1288,16 +1289,17 @@ public abstract class BsBoostDocumentRuleCA extends EsAbstractConditionAggregati
         setUrlExpr_Missing(null);
     }
 
-    public void setUrlExpr_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrlExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrlExpr_Missing("urlExpr", opLambda, null);
     }
 
-    public void setUrlExpr_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+    public void setUrlExpr_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
         setUrlExpr_Missing("urlExpr", opLambda, aggsLambda);
     }
 
-    public void setUrlExpr_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "urlExpr");
+    public void setUrlExpr_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsBoostDocumentRuleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "urlExpr");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
index c020451c2c98ac3d9cc15bddcbd74df15b293add..8c095ceb389273fb7fc2784797f4a5e4a9643342 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,17 +230,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,16 +256,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -280,12 +281,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,12 +296,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,16 +311,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,17 +332,16 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long expiredTime
     public void setExpiredTime_Avg() {
         setExpiredTime_Avg(null);
     }
 
-    public void setExpiredTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setExpiredTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setExpiredTime_Avg("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "expiredTime");
+    public void setExpiredTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,12 +351,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Max(null);
     }
 
-    public void setExpiredTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setExpiredTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setExpiredTime_Max("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "expiredTime");
+    public void setExpiredTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -365,12 +366,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Min(null);
     }
 
-    public void setExpiredTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setExpiredTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setExpiredTime_Min("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "expiredTime");
+    public void setExpiredTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -380,12 +381,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Sum(null);
     }
 
-    public void setExpiredTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setExpiredTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setExpiredTime_Sum("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "expiredTime");
+    public void setExpiredTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -395,12 +396,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_ExtendedStats(null);
     }
 
-    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setExpiredTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setExpiredTime_ExtendedStats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "expiredTime");
+    public void setExpiredTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +411,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Stats(null);
     }
 
-    public void setExpiredTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setExpiredTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setExpiredTime_Stats("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "expiredTime");
+    public void setExpiredTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +426,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Percentiles(null);
     }
 
-    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setExpiredTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setExpiredTime_Percentiles("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "expiredTime");
+    public void setExpiredTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,12 +441,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_PercentileRanks(null);
     }
 
-    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setExpiredTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setExpiredTime_PercentileRanks("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "expiredTime");
+    public void setExpiredTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -455,17 +456,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Histogram(null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Histogram("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setExpiredTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "expiredTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,16 +482,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Range(null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setExpiredTime_Range("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Range("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "expiredTime");
+    public void setExpiredTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -504,12 +507,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Count(null);
     }
 
-    public void setExpiredTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExpiredTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExpiredTime_Count("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "expiredTime");
+    public void setExpiredTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +522,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Cardinality(null);
     }
 
-    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExpiredTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExpiredTime_Cardinality("expiredTime", opLambda);
     }
 
-    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "expiredTime");
+    public void setExpiredTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -534,16 +537,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setExpiredTime_Missing(null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, null);
     }
 
-    public void setExpiredTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setExpiredTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setExpiredTime_Missing("expiredTime", opLambda, aggsLambda);
     }
 
-    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "expiredTime");
+    public void setExpiredTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "expiredTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -554,22 +558,20 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -584,17 +586,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,16 +612,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +637,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +652,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,16 +667,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,22 +688,21 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String sessionId
-
     public void setSessionId_Terms() {
         setSessionId_Terms(null);
     }
 
-    public void setSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSessionId_Terms("sessionId", opLambda, null);
     }
 
-    public void setSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_Terms("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "sessionId");
+    public void setSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -713,18 +717,18 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_SignificantTerms(null);
     }
 
-    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSessionId_SignificantTerms("sessionId", opLambda, null);
     }
 
-    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_SignificantTerms("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "sessionId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -739,16 +743,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_IpRange(null);
     }
 
-    public void setSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSessionId_IpRange("sessionId", opLambda, null);
     }
 
-    public void setSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_IpRange("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "sessionId");
+    public void setSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,12 +768,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Count(null);
     }
 
-    public void setSessionId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSessionId_Count("sessionId", opLambda);
     }
 
-    public void setSessionId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sessionId");
+    public void setSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,12 +783,12 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Cardinality(null);
     }
 
-    public void setSessionId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSessionId_Cardinality("sessionId", opLambda);
     }
 
-    public void setSessionId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sessionId");
+    public void setSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -793,16 +798,17 @@ public abstract class BsCrawlingInfoCA extends EsAbstractConditionAggregation {
         setSessionId_Missing(null);
     }
 
-    public void setSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSessionId_Missing("sessionId", opLambda, null);
     }
 
-    public void setSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+    public void setSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
         setSessionId_Missing("sessionId", opLambda, aggsLambda);
     }
 
-    public void setSessionId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sessionId");
+    public void setSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
index b6dccd32ce504d351f1335d3bb50d549c8d6c059..cb02fa31153624d28a07d402a64f8bd354fb71a8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsCrawlingInfoParamCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.CrawlingInfoParamCA;
 import org.codelibs.fess.es.config.cbean.cq.CrawlingInfoParamCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsCrawlingInfoParamCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,37 +92,36 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String crawlingInfoId
-
     public void setCrawlingInfoId_Terms() {
         setCrawlingInfoId_Terms(null);
     }
 
-    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCrawlingInfoId_Terms("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_Terms("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setCrawlingInfoId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "crawlingInfoId");
+        TermsAggregationBuilder builder = regTermsA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -137,18 +136,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_SignificantTerms(null);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCrawlingInfoId_SignificantTerms("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCrawlingInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_SignificantTerms("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCrawlingInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "crawlingInfoId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -163,17 +162,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_IpRange(null);
     }
 
-    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCrawlingInfoId_IpRange("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_IpRange("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCrawlingInfoId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "crawlingInfoId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -188,12 +188,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Count(null);
     }
 
-    public void setCrawlingInfoId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCrawlingInfoId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCrawlingInfoId_Count("crawlingInfoId", opLambda);
     }
 
-    public void setCrawlingInfoId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "crawlingInfoId");
+    public void setCrawlingInfoId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -203,12 +203,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Cardinality(null);
     }
 
-    public void setCrawlingInfoId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCrawlingInfoId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCrawlingInfoId_Cardinality("crawlingInfoId", opLambda);
     }
 
-    public void setCrawlingInfoId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "crawlingInfoId");
+    public void setCrawlingInfoId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -218,17 +218,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCrawlingInfoId_Missing(null);
     }
 
-    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCrawlingInfoId_Missing("crawlingInfoId", opLambda, null);
     }
 
-    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCrawlingInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCrawlingInfoId_Missing("crawlingInfoId", opLambda, aggsLambda);
     }
 
-    public void setCrawlingInfoId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCrawlingInfoId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "crawlingInfoId");
+        MissingAggregationBuilder builder = regMissingA(name, "crawlingInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -239,17 +240,16 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,12 +259,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -274,12 +274,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -289,12 +289,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -304,12 +304,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,12 +319,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -334,12 +334,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +349,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,17 +364,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -389,16 +390,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -413,12 +415,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -428,12 +430,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -443,17 +445,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -464,22 +467,21 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String key
-
     public void setKey_Terms() {
         setKey_Terms(null);
     }
 
-    public void setKey_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setKey_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setKey_Terms("key", opLambda, null);
     }
 
-    public void setKey_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_Terms("key", opLambda, aggsLambda);
     }
 
-    public void setKey_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "key");
+    public void setKey_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -494,18 +496,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_SignificantTerms(null);
     }
 
-    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setKey_SignificantTerms("key", opLambda, null);
     }
 
-    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setKey_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_SignificantTerms("key", opLambda, aggsLambda);
     }
 
-    public void setKey_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setKey_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "key");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,16 +522,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_IpRange(null);
     }
 
-    public void setKey_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setKey_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setKey_IpRange("key", opLambda, null);
     }
 
-    public void setKey_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_IpRange("key", opLambda, aggsLambda);
     }
 
-    public void setKey_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "key");
+    public void setKey_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -544,12 +547,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Count(null);
     }
 
-    public void setKey_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setKey_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setKey_Count("key", opLambda);
     }
 
-    public void setKey_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "key");
+    public void setKey_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -559,12 +562,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Cardinality(null);
     }
 
-    public void setKey_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setKey_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setKey_Cardinality("key", opLambda);
     }
 
-    public void setKey_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "key");
+    public void setKey_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -574,16 +577,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setKey_Missing(null);
     }
 
-    public void setKey_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setKey_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setKey_Missing("key", opLambda, null);
     }
 
-    public void setKey_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setKey_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setKey_Missing("key", opLambda, aggsLambda);
     }
 
-    public void setKey_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "key");
+    public void setKey_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "key");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -594,22 +598,21 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -624,18 +627,18 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -650,16 +653,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -674,12 +678,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -689,12 +693,12 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -704,16 +708,17 @@ public abstract class BsCrawlingInfoParamCA extends EsAbstractConditionAggregati
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsCrawlingInfoParamCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
index f17fc9b97d753ed59e2e79c3c7936dd6211568c1..945674b85d4547b258d2e42bcba638b45cc59f83 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.DataConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Boolean available
     public void setAvailable_Avg() {
         setAvailable_Avg(null);
     }
 
-    public void setAvailable_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setAvailable_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setAvailable_Avg("available", opLambda);
     }
 
-    public void setAvailable_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "available");
+    public void setAvailable_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Max(null);
     }
 
-    public void setAvailable_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setAvailable_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setAvailable_Max("available", opLambda);
     }
 
-    public void setAvailable_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "available");
+    public void setAvailable_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Min(null);
     }
 
-    public void setAvailable_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setAvailable_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setAvailable_Min("available", opLambda);
     }
 
-    public void setAvailable_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "available");
+    public void setAvailable_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Sum(null);
     }
 
-    public void setAvailable_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setAvailable_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setAvailable_Sum("available", opLambda);
     }
 
-    public void setAvailable_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "available");
+    public void setAvailable_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_ExtendedStats(null);
     }
 
-    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setAvailable_ExtendedStats("available", opLambda);
     }
 
-    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "available");
+    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Stats(null);
     }
 
-    public void setAvailable_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setAvailable_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setAvailable_Stats("available", opLambda);
     }
 
-    public void setAvailable_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "available");
+    public void setAvailable_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Percentiles(null);
     }
 
-    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setAvailable_Percentiles("available", opLambda);
     }
 
-    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "available");
+    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_PercentileRanks(null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setAvailable_PercentileRanks("available", opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Histogram(null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setAvailable_Histogram("available", opLambda, null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setAvailable_Histogram("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "available");
+    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Range(null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setAvailable_Range("available", opLambda, null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setAvailable_Range("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "available");
+    public void setAvailable_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +280,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Count(null);
     }
 
-    public void setAvailable_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAvailable_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAvailable_Count("available", opLambda);
     }
 
-    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "available");
+    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +295,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Cardinality(null);
     }
 
-    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAvailable_Cardinality("available", opLambda);
     }
 
-    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "available");
+    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +310,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Missing(null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAvailable_Missing("available", opLambda, null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setAvailable_Missing("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "available");
+    public void setAvailable_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,17 +331,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Float boost
     public void setBoost_Avg() {
         setBoost_Avg(null);
     }
 
-    public void setBoost_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setBoost_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setBoost_Avg("boost", opLambda);
     }
 
-    public void setBoost_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "boost");
+    public void setBoost_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +350,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Max(null);
     }
 
-    public void setBoost_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setBoost_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setBoost_Max("boost", opLambda);
     }
 
-    public void setBoost_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "boost");
+    public void setBoost_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,12 +365,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Min(null);
     }
 
-    public void setBoost_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setBoost_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setBoost_Min("boost", opLambda);
     }
 
-    public void setBoost_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "boost");
+    public void setBoost_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -379,12 +380,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Sum(null);
     }
 
-    public void setBoost_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setBoost_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setBoost_Sum("boost", opLambda);
     }
 
-    public void setBoost_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "boost");
+    public void setBoost_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -394,12 +395,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_ExtendedStats(null);
     }
 
-    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setBoost_ExtendedStats("boost", opLambda);
     }
 
-    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "boost");
+    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -409,12 +410,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Stats(null);
     }
 
-    public void setBoost_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setBoost_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setBoost_Stats("boost", opLambda);
     }
 
-    public void setBoost_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "boost");
+    public void setBoost_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,12 +425,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Percentiles(null);
     }
 
-    public void setBoost_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setBoost_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setBoost_Percentiles("boost", opLambda);
     }
 
-    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "boost");
+    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -439,12 +440,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_PercentileRanks(null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setBoost_PercentileRanks("boost", opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -454,16 +455,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Histogram(null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setBoost_Histogram("boost", opLambda, null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setBoost_Histogram("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "boost");
+    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,16 +480,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Range(null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setBoost_Range("boost", opLambda, null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setBoost_Range("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "boost");
+    public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,12 +504,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Count(null);
     }
 
-    public void setBoost_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoost_Count("boost", opLambda);
     }
 
-    public void setBoost_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boost");
+    public void setBoost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -517,12 +519,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Cardinality(null);
     }
 
-    public void setBoost_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoost_Cardinality("boost", opLambda);
     }
 
-    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boost");
+    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -532,16 +534,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setBoost_Missing(null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoost_Missing("boost", opLambda, null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setBoost_Missing("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boost");
+    public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,22 +555,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -582,17 +584,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -607,16 +610,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,12 +635,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -646,12 +650,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -661,16 +665,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -681,17 +686,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -701,12 +705,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,12 +720,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,12 +735,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -746,12 +750,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -761,12 +765,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -776,12 +780,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -791,12 +795,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -806,17 +810,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -831,16 +835,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -855,12 +860,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -870,12 +875,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -885,16 +890,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,22 +911,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String handlerName
-
     public void setHandlerName_Terms() {
         setHandlerName_Terms(null);
     }
 
-    public void setHandlerName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHandlerName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHandlerName_Terms("handlerName", opLambda, null);
     }
 
-    public void setHandlerName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerName_Terms("handlerName", opLambda, aggsLambda);
     }
 
-    public void setHandlerName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "handlerName");
+    public void setHandlerName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -935,18 +940,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerName_SignificantTerms(null);
     }
 
-    public void setHandlerName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHandlerName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHandlerName_SignificantTerms("handlerName", opLambda, null);
     }
 
-    public void setHandlerName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerName_SignificantTerms("handlerName", opLambda, aggsLambda);
     }
 
-    public void setHandlerName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "handlerName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -961,16 +966,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerName_IpRange(null);
     }
 
-    public void setHandlerName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHandlerName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHandlerName_IpRange("handlerName", opLambda, null);
     }
 
-    public void setHandlerName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerName_IpRange("handlerName", opLambda, aggsLambda);
     }
 
-    public void setHandlerName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "handlerName");
+    public void setHandlerName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -985,12 +991,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerName_Count(null);
     }
 
-    public void setHandlerName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHandlerName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHandlerName_Count("handlerName", opLambda);
     }
 
-    public void setHandlerName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "handlerName");
+    public void setHandlerName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1000,12 +1006,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerName_Cardinality(null);
     }
 
-    public void setHandlerName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHandlerName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHandlerName_Cardinality("handlerName", opLambda);
     }
 
-    public void setHandlerName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "handlerName");
+    public void setHandlerName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1015,16 +1021,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerName_Missing(null);
     }
 
-    public void setHandlerName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHandlerName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHandlerName_Missing("handlerName", opLambda, null);
     }
 
-    public void setHandlerName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerName_Missing("handlerName", opLambda, aggsLambda);
     }
 
-    public void setHandlerName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "handlerName");
+    public void setHandlerName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "handlerName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1035,22 +1042,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String handlerParameter
-
     public void setHandlerParameter_Terms() {
         setHandlerParameter_Terms(null);
     }
 
-    public void setHandlerParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHandlerParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHandlerParameter_Terms("handlerParameter", opLambda, null);
     }
 
-    public void setHandlerParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerParameter_Terms("handlerParameter", opLambda, aggsLambda);
     }
 
-    public void setHandlerParameter_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "handlerParameter");
+    public void setHandlerParameter_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1065,18 +1071,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerParameter_SignificantTerms(null);
     }
 
-    public void setHandlerParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHandlerParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHandlerParameter_SignificantTerms("handlerParameter", opLambda, null);
     }
 
-    public void setHandlerParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerParameter_SignificantTerms("handlerParameter", opLambda, aggsLambda);
     }
 
-    public void setHandlerParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "handlerParameter");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1091,17 +1097,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerParameter_IpRange(null);
     }
 
-    public void setHandlerParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHandlerParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHandlerParameter_IpRange("handlerParameter", opLambda, null);
     }
 
-    public void setHandlerParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerParameter_IpRange("handlerParameter", opLambda, aggsLambda);
     }
 
-    public void setHandlerParameter_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setHandlerParameter_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "handlerParameter");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1116,12 +1122,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerParameter_Count(null);
     }
 
-    public void setHandlerParameter_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHandlerParameter_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHandlerParameter_Count("handlerParameter", opLambda);
     }
 
-    public void setHandlerParameter_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "handlerParameter");
+    public void setHandlerParameter_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1131,12 +1137,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerParameter_Cardinality(null);
     }
 
-    public void setHandlerParameter_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHandlerParameter_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHandlerParameter_Cardinality("handlerParameter", opLambda);
     }
 
-    public void setHandlerParameter_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "handlerParameter");
+    public void setHandlerParameter_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1146,17 +1152,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerParameter_Missing(null);
     }
 
-    public void setHandlerParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHandlerParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHandlerParameter_Missing("handlerParameter", opLambda, null);
     }
 
-    public void setHandlerParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerParameter_Missing("handlerParameter", opLambda, aggsLambda);
     }
 
-    public void setHandlerParameter_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setHandlerParameter_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "handlerParameter");
+        MissingAggregationBuilder builder = regMissingA(name, "handlerParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1167,22 +1173,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String handlerScript
-
     public void setHandlerScript_Terms() {
         setHandlerScript_Terms(null);
     }
 
-    public void setHandlerScript_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHandlerScript_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHandlerScript_Terms("handlerScript", opLambda, null);
     }
 
-    public void setHandlerScript_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerScript_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerScript_Terms("handlerScript", opLambda, aggsLambda);
     }
 
-    public void setHandlerScript_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "handlerScript");
+    public void setHandlerScript_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1197,18 +1202,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerScript_SignificantTerms(null);
     }
 
-    public void setHandlerScript_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHandlerScript_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHandlerScript_SignificantTerms("handlerScript", opLambda, null);
     }
 
-    public void setHandlerScript_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerScript_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerScript_SignificantTerms("handlerScript", opLambda, aggsLambda);
     }
 
-    public void setHandlerScript_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHandlerScript_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "handlerScript");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1223,17 +1228,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerScript_IpRange(null);
     }
 
-    public void setHandlerScript_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHandlerScript_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHandlerScript_IpRange("handlerScript", opLambda, null);
     }
 
-    public void setHandlerScript_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerScript_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerScript_IpRange("handlerScript", opLambda, aggsLambda);
     }
 
-    public void setHandlerScript_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setHandlerScript_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "handlerScript");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1248,12 +1253,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerScript_Count(null);
     }
 
-    public void setHandlerScript_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHandlerScript_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHandlerScript_Count("handlerScript", opLambda);
     }
 
-    public void setHandlerScript_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "handlerScript");
+    public void setHandlerScript_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,12 +1268,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerScript_Cardinality(null);
     }
 
-    public void setHandlerScript_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHandlerScript_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHandlerScript_Cardinality("handlerScript", opLambda);
     }
 
-    public void setHandlerScript_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "handlerScript");
+    public void setHandlerScript_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1278,16 +1283,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setHandlerScript_Missing(null);
     }
 
-    public void setHandlerScript_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHandlerScript_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHandlerScript_Missing("handlerScript", opLambda, null);
     }
 
-    public void setHandlerScript_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setHandlerScript_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setHandlerScript_Missing("handlerScript", opLambda, aggsLambda);
     }
 
-    public void setHandlerScript_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "handlerScript");
+    public void setHandlerScript_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "handlerScript");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1298,22 +1304,20 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1328,17 +1332,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1353,16 +1358,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1377,12 +1383,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1392,12 +1398,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1407,16 +1413,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1427,22 +1434,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1457,18 +1463,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1483,16 +1489,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1507,12 +1514,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1522,12 +1529,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1537,16 +1544,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1557,17 +1565,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1577,12 +1584,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1592,12 +1599,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1607,12 +1614,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1622,12 +1629,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1637,12 +1644,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1652,12 +1659,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1667,12 +1674,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1682,16 +1689,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1706,16 +1714,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1730,12 +1739,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1745,12 +1754,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1760,16 +1769,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1780,22 +1790,21 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1810,17 +1819,18 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1835,16 +1845,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1859,12 +1870,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1874,12 +1885,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1889,16 +1900,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1909,17 +1921,16 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1929,12 +1940,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1944,12 +1955,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1959,12 +1970,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1974,12 +1985,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1989,12 +2000,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2004,12 +2015,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2019,12 +2030,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2034,17 +2045,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2059,16 +2070,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2083,12 +2095,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2098,12 +2110,12 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2113,16 +2125,17 @@ public abstract class BsDataConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToLabelCA.java
index bd8a6384cc83b690eb7644ec007b7ea0909811b7..51a479694e45210bc3a90c9a6b6812ef8670916b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToLabelCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.DataConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,37 +82,35 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String dataConfigId
-
     public void setDataConfigId_Terms() {
         setDataConfigId_Terms(null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "dataConfigId");
+        TermsAggregationBuilder builder = regTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -127,18 +125,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_SignificantTerms(null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "dataConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -153,17 +151,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_IpRange(null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "dataConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -178,12 +177,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Count(null);
     }
 
-    public void setDataConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDataConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDataConfigId_Count("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "dataConfigId");
+    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -193,12 +192,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Cardinality(null);
     }
 
-    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDataConfigId_Cardinality("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "dataConfigId");
+    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -208,17 +207,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setDataConfigId_Missing(null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "dataConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -229,22 +229,21 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,18 +258,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,17 +284,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,12 +310,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -325,12 +325,12 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,17 +340,18 @@ public abstract class BsDataConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToRoleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToRoleCA.java
index a4c51deb1e7032b0f3d6387d8081942a54a0796e..2274d12e26b325ae2e3d9cdfc2d4f40b533bf712 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDataConfigToRoleCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.DataConfigToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.DataConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDataConfigToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String dataConfigId
-
     public void setDataConfigId_Terms() {
         setDataConfigId_Terms(null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_Terms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "dataConfigId");
+    public void setDataConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_SignificantTerms(null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_SignificantTerms("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDataConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "dataConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_IpRange(null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_IpRange("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDataConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "dataConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Count(null);
     }
 
-    public void setDataConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDataConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDataConfigId_Count("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "dataConfigId");
+    public void setDataConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Cardinality(null);
     }
 
-    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDataConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDataConfigId_Cardinality("dataConfigId", opLambda);
     }
 
-    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "dataConfigId");
+    public void setDataConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setDataConfigId_Missing(null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, null);
     }
 
-    public void setDataConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setDataConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setDataConfigId_Missing("dataConfigId", opLambda, aggsLambda);
     }
 
-    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setDataConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "dataConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "dataConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,17 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +309,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +324,12 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +339,17 @@ public abstract class BsDataConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDataConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
index ee1479b5f504298bfcdec6c2f65f0eb25e8ad672..1688d593bfd8e170237637c19e2a553b65914d86 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsDuplicateHostCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.DuplicateHostCA;
 import org.codelibs.fess.es.config.cbean.cq.DuplicateHostCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsDuplicateHostCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,16 +161,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +186,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +201,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,16 +216,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -236,17 +237,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,12 +256,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,12 +271,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -286,12 +286,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -301,12 +301,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,12 +316,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -331,12 +331,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -346,12 +346,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -361,17 +361,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -386,16 +387,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +412,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +427,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,16 +442,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -460,23 +463,21 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String duplicateHostName
-
     public void setDuplicateHostName_Terms() {
         setDuplicateHostName_Terms(null);
     }
 
-    public void setDuplicateHostName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDuplicateHostName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDuplicateHostName_Terms("duplicateHostName", opLambda, null);
     }
 
-    public void setDuplicateHostName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setDuplicateHostName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setDuplicateHostName_Terms("duplicateHostName", opLambda, aggsLambda);
     }
 
-    public void setDuplicateHostName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setDuplicateHostName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "duplicateHostName");
+        TermsAggregationBuilder builder = regTermsA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,18 +492,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setDuplicateHostName_SignificantTerms(null);
     }
 
-    public void setDuplicateHostName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDuplicateHostName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDuplicateHostName_SignificantTerms("duplicateHostName", opLambda, null);
     }
 
-    public void setDuplicateHostName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDuplicateHostName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setDuplicateHostName_SignificantTerms("duplicateHostName", opLambda, aggsLambda);
     }
 
-    public void setDuplicateHostName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDuplicateHostName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "duplicateHostName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -517,17 +518,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setDuplicateHostName_IpRange(null);
     }
 
-    public void setDuplicateHostName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDuplicateHostName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDuplicateHostName_IpRange("duplicateHostName", opLambda, null);
     }
 
-    public void setDuplicateHostName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setDuplicateHostName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setDuplicateHostName_IpRange("duplicateHostName", opLambda, aggsLambda);
     }
 
-    public void setDuplicateHostName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDuplicateHostName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "duplicateHostName");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -542,12 +544,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setDuplicateHostName_Count(null);
     }
 
-    public void setDuplicateHostName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDuplicateHostName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDuplicateHostName_Count("duplicateHostName", opLambda);
     }
 
-    public void setDuplicateHostName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "duplicateHostName");
+    public void setDuplicateHostName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,12 +559,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setDuplicateHostName_Cardinality(null);
     }
 
-    public void setDuplicateHostName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDuplicateHostName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDuplicateHostName_Cardinality("duplicateHostName", opLambda);
     }
 
-    public void setDuplicateHostName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "duplicateHostName");
+    public void setDuplicateHostName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -572,17 +574,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setDuplicateHostName_Missing(null);
     }
 
-    public void setDuplicateHostName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDuplicateHostName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDuplicateHostName_Missing("duplicateHostName", opLambda, null);
     }
 
-    public void setDuplicateHostName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setDuplicateHostName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setDuplicateHostName_Missing("duplicateHostName", opLambda, aggsLambda);
     }
 
-    public void setDuplicateHostName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setDuplicateHostName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "duplicateHostName");
+        MissingAggregationBuilder builder = regMissingA(name, "duplicateHostName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -593,22 +596,21 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String regularName
-
     public void setRegularName_Terms() {
         setRegularName_Terms(null);
     }
 
-    public void setRegularName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRegularName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRegularName_Terms("regularName", opLambda, null);
     }
 
-    public void setRegularName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setRegularName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setRegularName_Terms("regularName", opLambda, aggsLambda);
     }
 
-    public void setRegularName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "regularName");
+    public void setRegularName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -623,18 +625,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setRegularName_SignificantTerms(null);
     }
 
-    public void setRegularName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRegularName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRegularName_SignificantTerms("regularName", opLambda, null);
     }
 
-    public void setRegularName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRegularName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setRegularName_SignificantTerms("regularName", opLambda, aggsLambda);
     }
 
-    public void setRegularName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRegularName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "regularName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -649,17 +651,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setRegularName_IpRange(null);
     }
 
-    public void setRegularName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRegularName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRegularName_IpRange("regularName", opLambda, null);
     }
 
-    public void setRegularName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setRegularName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setRegularName_IpRange("regularName", opLambda, aggsLambda);
     }
 
-    public void setRegularName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRegularName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "regularName");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -674,12 +676,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setRegularName_Count(null);
     }
 
-    public void setRegularName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRegularName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRegularName_Count("regularName", opLambda);
     }
 
-    public void setRegularName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "regularName");
+    public void setRegularName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -689,12 +691,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setRegularName_Cardinality(null);
     }
 
-    public void setRegularName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRegularName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRegularName_Cardinality("regularName", opLambda);
     }
 
-    public void setRegularName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "regularName");
+    public void setRegularName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -704,16 +706,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setRegularName_Missing(null);
     }
 
-    public void setRegularName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRegularName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRegularName_Missing("regularName", opLambda, null);
     }
 
-    public void setRegularName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setRegularName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setRegularName_Missing("regularName", opLambda, aggsLambda);
     }
 
-    public void setRegularName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "regularName");
+    public void setRegularName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "regularName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -724,17 +727,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -744,12 +746,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -759,12 +761,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -774,12 +776,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -789,12 +791,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -804,12 +806,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -819,12 +821,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -834,12 +836,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,17 +851,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -874,16 +876,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -898,12 +901,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -913,12 +916,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -928,16 +931,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -948,22 +952,21 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -978,18 +981,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1004,16 +1007,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1028,12 +1032,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1043,12 +1047,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1058,16 +1062,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1078,17 +1083,16 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1098,12 +1102,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1113,12 +1117,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1128,12 +1132,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1143,12 +1147,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1158,12 +1162,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1173,12 +1177,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1188,12 +1192,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1203,17 +1207,18 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1228,16 +1233,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,12 +1258,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1267,12 +1273,12 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1282,16 +1288,17 @@ public abstract class BsDuplicateHostCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsDuplicateHostCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsDuplicateHostCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
index 3bbcf05c69808a8dc2e56534bef3b4953bf4135d..6e5a79c0c8fdf69c6b3eb7dce4b04d02ebea2db2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.ElevateWordCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Float boost
     public void setBoost_Avg() {
         setBoost_Avg(null);
     }
 
-    public void setBoost_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setBoost_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setBoost_Avg("boost", opLambda);
     }
 
-    public void setBoost_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "boost");
+    public void setBoost_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Max(null);
     }
 
-    public void setBoost_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setBoost_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setBoost_Max("boost", opLambda);
     }
 
-    public void setBoost_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "boost");
+    public void setBoost_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Min(null);
     }
 
-    public void setBoost_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setBoost_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setBoost_Min("boost", opLambda);
     }
 
-    public void setBoost_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "boost");
+    public void setBoost_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Sum(null);
     }
 
-    public void setBoost_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setBoost_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setBoost_Sum("boost", opLambda);
     }
 
-    public void setBoost_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "boost");
+    public void setBoost_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_ExtendedStats(null);
     }
 
-    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setBoost_ExtendedStats("boost", opLambda);
     }
 
-    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "boost");
+    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Stats(null);
     }
 
-    public void setBoost_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setBoost_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setBoost_Stats("boost", opLambda);
     }
 
-    public void setBoost_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "boost");
+    public void setBoost_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Percentiles(null);
     }
 
-    public void setBoost_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setBoost_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setBoost_Percentiles("boost", opLambda);
     }
 
-    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "boost");
+    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_PercentileRanks(null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setBoost_PercentileRanks("boost", opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Histogram(null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setBoost_Histogram("boost", opLambda, null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setBoost_Histogram("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "boost");
+    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Range(null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setBoost_Range("boost", opLambda, null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setBoost_Range("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "boost");
+    public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +279,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Count(null);
     }
 
-    public void setBoost_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoost_Count("boost", opLambda);
     }
 
-    public void setBoost_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boost");
+    public void setBoost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +294,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Cardinality(null);
     }
 
-    public void setBoost_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoost_Cardinality("boost", opLambda);
     }
 
-    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boost");
+    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +309,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setBoost_Missing(null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoost_Missing("boost", opLambda, null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setBoost_Missing("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boost");
+    public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,22 +330,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -359,18 +359,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -385,16 +385,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -409,12 +410,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,12 +425,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -439,16 +440,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -459,17 +461,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,12 +480,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -494,12 +495,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -509,12 +510,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,12 +525,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,12 +540,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -554,12 +555,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -569,12 +570,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -584,17 +585,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,16 +610,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +635,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +650,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,16 +665,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,22 +686,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String reading
-
     public void setReading_Terms() {
         setReading_Terms(null);
     }
 
-    public void setReading_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setReading_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setReading_Terms("reading", opLambda, null);
     }
 
-    public void setReading_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setReading_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setReading_Terms("reading", opLambda, aggsLambda);
     }
 
-    public void setReading_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "reading");
+    public void setReading_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -713,17 +715,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setReading_SignificantTerms(null);
     }
 
-    public void setReading_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setReading_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setReading_SignificantTerms("reading", opLambda, null);
     }
 
-    public void setReading_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setReading_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
         setReading_SignificantTerms("reading", opLambda, aggsLambda);
     }
 
-    public void setReading_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setReading_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "reading");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -738,16 +741,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setReading_IpRange(null);
     }
 
-    public void setReading_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setReading_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setReading_IpRange("reading", opLambda, null);
     }
 
-    public void setReading_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setReading_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setReading_IpRange("reading", opLambda, aggsLambda);
     }
 
-    public void setReading_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "reading");
+    public void setReading_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -762,12 +766,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setReading_Count(null);
     }
 
-    public void setReading_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setReading_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setReading_Count("reading", opLambda);
     }
 
-    public void setReading_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "reading");
+    public void setReading_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -777,12 +781,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setReading_Cardinality(null);
     }
 
-    public void setReading_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setReading_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setReading_Cardinality("reading", opLambda);
     }
 
-    public void setReading_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "reading");
+    public void setReading_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -792,16 +796,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setReading_Missing(null);
     }
 
-    public void setReading_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setReading_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setReading_Missing("reading", opLambda, null);
     }
 
-    public void setReading_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setReading_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setReading_Missing("reading", opLambda, aggsLambda);
     }
 
-    public void setReading_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "reading");
+    public void setReading_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "reading");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -812,22 +817,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String suggestWord
-
     public void setSuggestWord_Terms() {
         setSuggestWord_Terms(null);
     }
 
-    public void setSuggestWord_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSuggestWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSuggestWord_Terms("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setSuggestWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setSuggestWord_Terms("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "suggestWord");
+    public void setSuggestWord_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -842,18 +846,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_SignificantTerms(null);
     }
 
-    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSuggestWord_SignificantTerms("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSuggestWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setSuggestWord_SignificantTerms("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSuggestWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "suggestWord");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -868,16 +872,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_IpRange(null);
     }
 
-    public void setSuggestWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSuggestWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSuggestWord_IpRange("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setSuggestWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setSuggestWord_IpRange("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "suggestWord");
+    public void setSuggestWord_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -892,12 +897,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Count(null);
     }
 
-    public void setSuggestWord_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSuggestWord_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSuggestWord_Count("suggestWord", opLambda);
     }
 
-    public void setSuggestWord_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "suggestWord");
+    public void setSuggestWord_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,12 +912,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Cardinality(null);
     }
 
-    public void setSuggestWord_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSuggestWord_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSuggestWord_Cardinality("suggestWord", opLambda);
     }
 
-    public void setSuggestWord_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "suggestWord");
+    public void setSuggestWord_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -922,16 +927,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setSuggestWord_Missing(null);
     }
 
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSuggestWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSuggestWord_Missing("suggestWord", opLambda, null);
     }
 
-    public void setSuggestWord_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setSuggestWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setSuggestWord_Missing("suggestWord", opLambda, aggsLambda);
     }
 
-    public void setSuggestWord_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "suggestWord");
+    public void setSuggestWord_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "suggestWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -942,22 +948,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String targetLabel
-
     public void setTargetLabel_Terms() {
         setTargetLabel_Terms(null);
     }
 
-    public void setTargetLabel_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTargetLabel_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTargetLabel_Terms("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetLabel_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetLabel_Terms("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "targetLabel");
+    public void setTargetLabel_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -972,18 +977,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_SignificantTerms(null);
     }
 
-    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTargetLabel_SignificantTerms("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetLabel_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetLabel_SignificantTerms("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetLabel_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "targetLabel");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -998,16 +1003,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_IpRange(null);
     }
 
-    public void setTargetLabel_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTargetLabel_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTargetLabel_IpRange("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetLabel_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetLabel_IpRange("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "targetLabel");
+    public void setTargetLabel_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,12 +1028,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Count(null);
     }
 
-    public void setTargetLabel_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTargetLabel_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTargetLabel_Count("targetLabel", opLambda);
     }
 
-    public void setTargetLabel_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "targetLabel");
+    public void setTargetLabel_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1037,12 +1043,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Cardinality(null);
     }
 
-    public void setTargetLabel_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTargetLabel_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTargetLabel_Cardinality("targetLabel", opLambda);
     }
 
-    public void setTargetLabel_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "targetLabel");
+    public void setTargetLabel_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1052,16 +1058,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetLabel_Missing(null);
     }
 
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTargetLabel_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTargetLabel_Missing("targetLabel", opLambda, null);
     }
 
-    public void setTargetLabel_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetLabel_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetLabel_Missing("targetLabel", opLambda, aggsLambda);
     }
 
-    public void setTargetLabel_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "targetLabel");
+    public void setTargetLabel_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "targetLabel");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1072,22 +1079,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String targetRole
-
     public void setTargetRole_Terms() {
         setTargetRole_Terms(null);
     }
 
-    public void setTargetRole_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTargetRole_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTargetRole_Terms("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetRole_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetRole_Terms("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "targetRole");
+    public void setTargetRole_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,18 +1108,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetRole_SignificantTerms(null);
     }
 
-    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTargetRole_SignificantTerms("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetRole_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetRole_SignificantTerms("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTargetRole_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "targetRole");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1128,16 +1134,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetRole_IpRange(null);
     }
 
-    public void setTargetRole_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTargetRole_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTargetRole_IpRange("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetRole_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetRole_IpRange("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "targetRole");
+    public void setTargetRole_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1152,12 +1159,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Count(null);
     }
 
-    public void setTargetRole_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTargetRole_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTargetRole_Count("targetRole", opLambda);
     }
 
-    public void setTargetRole_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "targetRole");
+    public void setTargetRole_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1167,12 +1174,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Cardinality(null);
     }
 
-    public void setTargetRole_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTargetRole_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTargetRole_Cardinality("targetRole", opLambda);
     }
 
-    public void setTargetRole_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "targetRole");
+    public void setTargetRole_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1182,16 +1189,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setTargetRole_Missing(null);
     }
 
-    public void setTargetRole_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTargetRole_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTargetRole_Missing("targetRole", opLambda, null);
     }
 
-    public void setTargetRole_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setTargetRole_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setTargetRole_Missing("targetRole", opLambda, aggsLambda);
     }
 
-    public void setTargetRole_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "targetRole");
+    public void setTargetRole_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "targetRole");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1202,22 +1210,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1232,18 +1239,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1258,16 +1265,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1282,12 +1290,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,12 +1305,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1312,16 +1320,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1332,22 +1341,21 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1362,18 +1370,18 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1388,16 +1396,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1412,12 +1421,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1427,12 +1436,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1442,16 +1451,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1462,17 +1472,16 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,12 +1491,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1497,12 +1506,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1512,12 +1521,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1527,12 +1536,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1542,12 +1551,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1557,12 +1566,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1572,12 +1581,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1587,17 +1596,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1612,16 +1621,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1636,12 +1646,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1651,12 +1661,12 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1666,16 +1676,17 @@ public abstract class BsElevateWordCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
index dbfe520f9d3e489341515bc7361545eea8061be1..1b1cfeb9d1c79df45007aadda7354617a831a6d7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsElevateWordToLabelCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.ElevateWordToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.ElevateWordToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsElevateWordToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -83,37 +83,36 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String elevateWordId
-
     public void setElevateWordId_Terms() {
         setElevateWordId_Terms(null);
     }
 
-    public void setElevateWordId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setElevateWordId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setElevateWordId_Terms("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_Terms("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setElevateWordId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "elevateWordId");
+        TermsAggregationBuilder builder = regTermsA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -128,18 +127,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_SignificantTerms(null);
     }
 
-    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setElevateWordId_SignificantTerms("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setElevateWordId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_SignificantTerms("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setElevateWordId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "elevateWordId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -154,17 +153,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_IpRange(null);
     }
 
-    public void setElevateWordId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setElevateWordId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setElevateWordId_IpRange("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_IpRange("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setElevateWordId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "elevateWordId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -179,12 +179,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Count(null);
     }
 
-    public void setElevateWordId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setElevateWordId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setElevateWordId_Count("elevateWordId", opLambda);
     }
 
-    public void setElevateWordId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "elevateWordId");
+    public void setElevateWordId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -194,12 +194,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Cardinality(null);
     }
 
-    public void setElevateWordId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setElevateWordId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setElevateWordId_Cardinality("elevateWordId", opLambda);
     }
 
-    public void setElevateWordId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "elevateWordId");
+    public void setElevateWordId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -209,17 +209,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setElevateWordId_Missing(null);
     }
 
-    public void setElevateWordId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setElevateWordId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setElevateWordId_Missing("elevateWordId", opLambda, null);
     }
 
-    public void setElevateWordId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setElevateWordId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setElevateWordId_Missing("elevateWordId", opLambda, aggsLambda);
     }
 
-    public void setElevateWordId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setElevateWordId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "elevateWordId");
+        MissingAggregationBuilder builder = regMissingA(name, "elevateWordId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -230,23 +231,21 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,18 +260,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -287,17 +286,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +312,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,12 +327,12 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -342,17 +342,18 @@ public abstract class BsElevateWordToLabelCA extends EsAbstractConditionAggregat
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsElevateWordToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
index 243766aac38e17d5c3c96f708bd82715c3cdda00..d31f22c4747ccb4b9cf66153ef092ab70738ed82 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFailureUrlCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.FailureUrlCA;
 import org.codelibs.fess.es.config.cbean.cq.FailureUrlCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFailureUrlCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String configId
-
     public void setConfigId_Terms() {
         setConfigId_Terms(null);
     }
 
-    public void setConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setConfigId_Terms("configId", opLambda, null);
     }
 
-    public void setConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setConfigId_Terms("configId", opLambda, aggsLambda);
     }
 
-    public void setConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "configId");
+    public void setConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +135,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setConfigId_SignificantTerms(null);
     }
 
-    public void setConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setConfigId_SignificantTerms("configId", opLambda, null);
     }
 
-    public void setConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
         setConfigId_SignificantTerms("configId", opLambda, aggsLambda);
     }
 
-    public void setConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "configId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +161,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setConfigId_IpRange(null);
     }
 
-    public void setConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setConfigId_IpRange("configId", opLambda, null);
     }
 
-    public void setConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setConfigId_IpRange("configId", opLambda, aggsLambda);
     }
 
-    public void setConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "configId");
+    public void setConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +186,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setConfigId_Count(null);
     }
 
-    public void setConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setConfigId_Count("configId", opLambda);
     }
 
-    public void setConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "configId");
+    public void setConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +201,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setConfigId_Cardinality(null);
     }
 
-    public void setConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setConfigId_Cardinality("configId", opLambda);
     }
 
-    public void setConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "configId");
+    public void setConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +216,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setConfigId_Missing(null);
     }
 
-    public void setConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setConfigId_Missing("configId", opLambda, null);
     }
 
-    public void setConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setConfigId_Missing("configId", opLambda, aggsLambda);
     }
 
-    public void setConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "configId");
+    public void setConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "configId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,17 +237,16 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer errorCount
     public void setErrorCount_Avg() {
         setErrorCount_Avg(null);
     }
 
-    public void setErrorCount_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setErrorCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setErrorCount_Avg("errorCount", opLambda);
     }
 
-    public void setErrorCount_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "errorCount");
+    public void setErrorCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +256,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Max(null);
     }
 
-    public void setErrorCount_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setErrorCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setErrorCount_Max("errorCount", opLambda);
     }
 
-    public void setErrorCount_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "errorCount");
+    public void setErrorCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +271,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Min(null);
     }
 
-    public void setErrorCount_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setErrorCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setErrorCount_Min("errorCount", opLambda);
     }
 
-    public void setErrorCount_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "errorCount");
+    public void setErrorCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,12 +286,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Sum(null);
     }
 
-    public void setErrorCount_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setErrorCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setErrorCount_Sum("errorCount", opLambda);
     }
 
-    public void setErrorCount_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "errorCount");
+    public void setErrorCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -300,12 +301,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_ExtendedStats(null);
     }
 
-    public void setErrorCount_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setErrorCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setErrorCount_ExtendedStats("errorCount", opLambda);
     }
 
-    public void setErrorCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "errorCount");
+    public void setErrorCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -315,12 +316,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Stats(null);
     }
 
-    public void setErrorCount_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setErrorCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setErrorCount_Stats("errorCount", opLambda);
     }
 
-    public void setErrorCount_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "errorCount");
+    public void setErrorCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,12 +331,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Percentiles(null);
     }
 
-    public void setErrorCount_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setErrorCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setErrorCount_Percentiles("errorCount", opLambda);
     }
 
-    public void setErrorCount_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "errorCount");
+    public void setErrorCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -345,12 +346,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_PercentileRanks(null);
     }
 
-    public void setErrorCount_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setErrorCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setErrorCount_PercentileRanks("errorCount", opLambda);
     }
 
-    public void setErrorCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "errorCount");
+    public void setErrorCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -360,16 +361,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Histogram(null);
     }
 
-    public void setErrorCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setErrorCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setErrorCount_Histogram("errorCount", opLambda, null);
     }
 
-    public void setErrorCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorCount_Histogram("errorCount", opLambda, aggsLambda);
     }
 
-    public void setErrorCount_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "errorCount");
+    public void setErrorCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +386,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Range(null);
     }
 
-    public void setErrorCount_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setErrorCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setErrorCount_Range("errorCount", opLambda, null);
     }
 
-    public void setErrorCount_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorCount_Range("errorCount", opLambda, aggsLambda);
     }
 
-    public void setErrorCount_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "errorCount");
+    public void setErrorCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +411,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Count(null);
     }
 
-    public void setErrorCount_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setErrorCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setErrorCount_Count("errorCount", opLambda);
     }
 
-    public void setErrorCount_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "errorCount");
+    public void setErrorCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +426,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Cardinality(null);
     }
 
-    public void setErrorCount_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setErrorCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setErrorCount_Cardinality("errorCount", opLambda);
     }
 
-    public void setErrorCount_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "errorCount");
+    public void setErrorCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +441,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorCount_Missing(null);
     }
 
-    public void setErrorCount_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setErrorCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setErrorCount_Missing("errorCount", opLambda, null);
     }
 
-    public void setErrorCount_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorCount_Missing("errorCount", opLambda, aggsLambda);
     }
 
-    public void setErrorCount_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "errorCount");
+    public void setErrorCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "errorCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,22 +462,21 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String errorLog
-
     public void setErrorLog_Terms() {
         setErrorLog_Terms(null);
     }
 
-    public void setErrorLog_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setErrorLog_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setErrorLog_Terms("errorLog", opLambda, null);
     }
 
-    public void setErrorLog_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorLog_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorLog_Terms("errorLog", opLambda, aggsLambda);
     }
 
-    public void setErrorLog_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "errorLog");
+    public void setErrorLog_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,17 +491,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorLog_SignificantTerms(null);
     }
 
-    public void setErrorLog_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setErrorLog_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setErrorLog_SignificantTerms("errorLog", opLambda, null);
     }
 
-    public void setErrorLog_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorLog_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorLog_SignificantTerms("errorLog", opLambda, aggsLambda);
     }
 
-    public void setErrorLog_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setErrorLog_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "errorLog");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,16 +517,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorLog_IpRange(null);
     }
 
-    public void setErrorLog_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setErrorLog_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setErrorLog_IpRange("errorLog", opLambda, null);
     }
 
-    public void setErrorLog_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorLog_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorLog_IpRange("errorLog", opLambda, aggsLambda);
     }
 
-    public void setErrorLog_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "errorLog");
+    public void setErrorLog_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -537,12 +542,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorLog_Count(null);
     }
 
-    public void setErrorLog_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setErrorLog_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setErrorLog_Count("errorLog", opLambda);
     }
 
-    public void setErrorLog_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "errorLog");
+    public void setErrorLog_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,12 +557,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorLog_Cardinality(null);
     }
 
-    public void setErrorLog_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setErrorLog_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setErrorLog_Cardinality("errorLog", opLambda);
     }
 
-    public void setErrorLog_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "errorLog");
+    public void setErrorLog_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -567,16 +572,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorLog_Missing(null);
     }
 
-    public void setErrorLog_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setErrorLog_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setErrorLog_Missing("errorLog", opLambda, null);
     }
 
-    public void setErrorLog_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorLog_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorLog_Missing("errorLog", opLambda, aggsLambda);
     }
 
-    public void setErrorLog_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "errorLog");
+    public void setErrorLog_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "errorLog");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,22 +593,21 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String errorName
-
     public void setErrorName_Terms() {
         setErrorName_Terms(null);
     }
 
-    public void setErrorName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setErrorName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setErrorName_Terms("errorName", opLambda, null);
     }
 
-    public void setErrorName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorName_Terms("errorName", opLambda, aggsLambda);
     }
 
-    public void setErrorName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "errorName");
+    public void setErrorName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -617,17 +622,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorName_SignificantTerms(null);
     }
 
-    public void setErrorName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setErrorName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setErrorName_SignificantTerms("errorName", opLambda, null);
     }
 
-    public void setErrorName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorName_SignificantTerms("errorName", opLambda, aggsLambda);
     }
 
-    public void setErrorName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setErrorName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "errorName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,16 +648,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorName_IpRange(null);
     }
 
-    public void setErrorName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setErrorName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setErrorName_IpRange("errorName", opLambda, null);
     }
 
-    public void setErrorName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorName_IpRange("errorName", opLambda, aggsLambda);
     }
 
-    public void setErrorName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "errorName");
+    public void setErrorName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -666,12 +673,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorName_Count(null);
     }
 
-    public void setErrorName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setErrorName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setErrorName_Count("errorName", opLambda);
     }
 
-    public void setErrorName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "errorName");
+    public void setErrorName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -681,12 +688,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorName_Cardinality(null);
     }
 
-    public void setErrorName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setErrorName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setErrorName_Cardinality("errorName", opLambda);
     }
 
-    public void setErrorName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "errorName");
+    public void setErrorName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -696,16 +703,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setErrorName_Missing(null);
     }
 
-    public void setErrorName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setErrorName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setErrorName_Missing("errorName", opLambda, null);
     }
 
-    public void setErrorName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setErrorName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setErrorName_Missing("errorName", opLambda, aggsLambda);
     }
 
-    public void setErrorName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "errorName");
+    public void setErrorName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "errorName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,17 +724,16 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long lastAccessTime
     public void setLastAccessTime_Avg() {
         setLastAccessTime_Avg(null);
     }
 
-    public void setLastAccessTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setLastAccessTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setLastAccessTime_Avg("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "lastAccessTime");
+    public void setLastAccessTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -736,12 +743,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Max(null);
     }
 
-    public void setLastAccessTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setLastAccessTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setLastAccessTime_Max("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "lastAccessTime");
+    public void setLastAccessTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -751,12 +758,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Min(null);
     }
 
-    public void setLastAccessTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setLastAccessTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setLastAccessTime_Min("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "lastAccessTime");
+    public void setLastAccessTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -766,12 +773,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Sum(null);
     }
 
-    public void setLastAccessTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setLastAccessTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setLastAccessTime_Sum("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "lastAccessTime");
+    public void setLastAccessTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -781,12 +788,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_ExtendedStats(null);
     }
 
-    public void setLastAccessTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setLastAccessTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setLastAccessTime_ExtendedStats("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "lastAccessTime");
+    public void setLastAccessTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -796,12 +803,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Stats(null);
     }
 
-    public void setLastAccessTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setLastAccessTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setLastAccessTime_Stats("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "lastAccessTime");
+    public void setLastAccessTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -811,12 +818,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Percentiles(null);
     }
 
-    public void setLastAccessTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setLastAccessTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setLastAccessTime_Percentiles("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "lastAccessTime");
+    public void setLastAccessTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -826,12 +833,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_PercentileRanks(null);
     }
 
-    public void setLastAccessTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setLastAccessTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setLastAccessTime_PercentileRanks("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "lastAccessTime");
+    public void setLastAccessTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -841,17 +848,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Histogram(null);
     }
 
-    public void setLastAccessTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setLastAccessTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setLastAccessTime_Histogram("lastAccessTime", opLambda, null);
     }
 
-    public void setLastAccessTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setLastAccessTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
         setLastAccessTime_Histogram("lastAccessTime", opLambda, aggsLambda);
     }
 
-    public void setLastAccessTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setLastAccessTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "lastAccessTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -866,16 +874,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Range(null);
     }
 
-    public void setLastAccessTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setLastAccessTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setLastAccessTime_Range("lastAccessTime", opLambda, null);
     }
 
-    public void setLastAccessTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setLastAccessTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setLastAccessTime_Range("lastAccessTime", opLambda, aggsLambda);
     }
 
-    public void setLastAccessTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "lastAccessTime");
+    public void setLastAccessTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -890,12 +899,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Count(null);
     }
 
-    public void setLastAccessTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLastAccessTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLastAccessTime_Count("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "lastAccessTime");
+    public void setLastAccessTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,12 +914,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Cardinality(null);
     }
 
-    public void setLastAccessTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLastAccessTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLastAccessTime_Cardinality("lastAccessTime", opLambda);
     }
 
-    public void setLastAccessTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "lastAccessTime");
+    public void setLastAccessTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -920,16 +929,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setLastAccessTime_Missing(null);
     }
 
-    public void setLastAccessTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLastAccessTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLastAccessTime_Missing("lastAccessTime", opLambda, null);
     }
 
-    public void setLastAccessTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setLastAccessTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setLastAccessTime_Missing("lastAccessTime", opLambda, aggsLambda);
     }
 
-    public void setLastAccessTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "lastAccessTime");
+    public void setLastAccessTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "lastAccessTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -940,22 +950,21 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String threadName
-
     public void setThreadName_Terms() {
         setThreadName_Terms(null);
     }
 
-    public void setThreadName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setThreadName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setThreadName_Terms("threadName", opLambda, null);
     }
 
-    public void setThreadName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setThreadName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setThreadName_Terms("threadName", opLambda, aggsLambda);
     }
 
-    public void setThreadName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "threadName");
+    public void setThreadName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -970,18 +979,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setThreadName_SignificantTerms(null);
     }
 
-    public void setThreadName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setThreadName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setThreadName_SignificantTerms("threadName", opLambda, null);
     }
 
-    public void setThreadName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setThreadName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
         setThreadName_SignificantTerms("threadName", opLambda, aggsLambda);
     }
 
-    public void setThreadName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setThreadName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "threadName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -996,16 +1005,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setThreadName_IpRange(null);
     }
 
-    public void setThreadName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setThreadName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setThreadName_IpRange("threadName", opLambda, null);
     }
 
-    public void setThreadName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setThreadName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setThreadName_IpRange("threadName", opLambda, aggsLambda);
     }
 
-    public void setThreadName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "threadName");
+    public void setThreadName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1020,12 +1030,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setThreadName_Count(null);
     }
 
-    public void setThreadName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setThreadName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setThreadName_Count("threadName", opLambda);
     }
 
-    public void setThreadName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "threadName");
+    public void setThreadName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1035,12 +1045,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setThreadName_Cardinality(null);
     }
 
-    public void setThreadName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setThreadName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setThreadName_Cardinality("threadName", opLambda);
     }
 
-    public void setThreadName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "threadName");
+    public void setThreadName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1050,16 +1060,17 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setThreadName_Missing(null);
     }
 
-    public void setThreadName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setThreadName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setThreadName_Missing("threadName", opLambda, null);
     }
 
-    public void setThreadName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setThreadName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setThreadName_Missing("threadName", opLambda, aggsLambda);
     }
 
-    public void setThreadName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "threadName");
+    public void setThreadName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "threadName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1070,22 +1081,20 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String url
-
     public void setUrl_Terms() {
         setUrl_Terms(null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrl_Terms("url", opLambda, null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setUrl_Terms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "url");
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,17 +1109,18 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setUrl_SignificantTerms(null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrl_SignificantTerms("url", opLambda, null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFailureUrlCA> aggsLambda) {
         setUrl_SignificantTerms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFailureUrlCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "url");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1125,16 +1135,16 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setUrl_IpRange(null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrl_IpRange("url", opLambda, null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setUrl_IpRange("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "url");
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1149,12 +1159,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setUrl_Count(null);
     }
 
-    public void setUrl_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrl_Count("url", opLambda);
     }
 
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "url");
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1164,12 +1174,12 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setUrl_Cardinality(null);
     }
 
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrl_Cardinality("url", opLambda);
     }
 
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "url");
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1179,16 +1189,16 @@ public abstract class BsFailureUrlCA extends EsAbstractConditionAggregation {
         setUrl_Missing(null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrl_Missing("url", opLambda, null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
         setUrl_Missing("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "url");
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFailureUrlCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
index ad0325c3cb1b526849fbe78a340988e12485761d..759202015b342bdf3e319db4aa0404b581b2b7b0 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileAuthenticationCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.FileAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.FileAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileAuthenticationCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -93,36 +93,35 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -137,18 +136,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -163,17 +162,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -188,12 +188,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -203,12 +203,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -218,17 +218,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -239,17 +240,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,12 +259,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -274,12 +274,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -289,12 +289,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -304,12 +304,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,12 +319,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -334,12 +334,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +349,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,17 +364,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -389,17 +390,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda,
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -414,12 +415,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -429,12 +430,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -444,17 +445,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -465,23 +467,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String fileConfigId
-
     public void setFileConfigId_Terms() {
         setFileConfigId_Terms(null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "fileConfigId");
+        TermsAggregationBuilder builder = regTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -496,18 +496,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setFileConfigId_SignificantTerms(null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "fileConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -522,17 +522,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setFileConfigId_IpRange(null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "fileConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,12 +548,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setFileConfigId_Count(null);
     }
 
-    public void setFileConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFileConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFileConfigId_Count("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "fileConfigId");
+    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -562,12 +563,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setFileConfigId_Cardinality(null);
     }
 
-    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFileConfigId_Cardinality("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "fileConfigId");
+    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -577,17 +578,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setFileConfigId_Missing(null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "fileConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -598,22 +600,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String hostname
-
     public void setHostname_Terms() {
         setHostname_Terms(null);
     }
 
-    public void setHostname_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHostname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHostname_Terms("hostname", opLambda, null);
     }
 
-    public void setHostname_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setHostname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setHostname_Terms("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "hostname");
+    public void setHostname_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -628,18 +629,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setHostname_SignificantTerms(null);
     }
 
-    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHostname_SignificantTerms("hostname", opLambda, null);
     }
 
-    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setHostname_SignificantTerms("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHostname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "hostname");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -654,17 +655,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setHostname_IpRange(null);
     }
 
-    public void setHostname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHostname_IpRange("hostname", opLambda, null);
     }
 
-    public void setHostname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setHostname_IpRange("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setHostname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "hostname");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -679,12 +680,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setHostname_Count(null);
     }
 
-    public void setHostname_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHostname_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHostname_Count("hostname", opLambda);
     }
 
-    public void setHostname_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "hostname");
+    public void setHostname_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -694,12 +695,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setHostname_Cardinality(null);
     }
 
-    public void setHostname_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHostname_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHostname_Cardinality("hostname", opLambda);
     }
 
-    public void setHostname_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "hostname");
+    public void setHostname_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,17 +710,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setHostname_Missing(null);
     }
 
-    public void setHostname_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHostname_Missing("hostname", opLambda, null);
     }
 
-    public void setHostname_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setHostname_Missing("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setHostname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "hostname");
+        MissingAggregationBuilder builder = regMissingA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -730,22 +731,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String parameters
-
     public void setParameters_Terms() {
         setParameters_Terms(null);
     }
 
-    public void setParameters_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setParameters_Terms("parameters", opLambda, null);
     }
 
-    public void setParameters_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setParameters_Terms("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "parameters");
+    public void setParameters_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -760,18 +760,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setParameters_SignificantTerms(null);
     }
 
-    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setParameters_SignificantTerms("parameters", opLambda, null);
     }
 
-    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setParameters_SignificantTerms("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameters_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "parameters");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -786,17 +786,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setParameters_IpRange(null);
     }
 
-    public void setParameters_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setParameters_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setParameters_IpRange("parameters", opLambda, null);
     }
 
-    public void setParameters_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setParameters_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setParameters_IpRange("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setParameters_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "parameters");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -811,12 +812,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setParameters_Count(null);
     }
 
-    public void setParameters_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setParameters_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setParameters_Count("parameters", opLambda);
     }
 
-    public void setParameters_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "parameters");
+    public void setParameters_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -826,12 +827,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setParameters_Cardinality(null);
     }
 
-    public void setParameters_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setParameters_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setParameters_Cardinality("parameters", opLambda);
     }
 
-    public void setParameters_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "parameters");
+    public void setParameters_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -841,17 +842,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setParameters_Missing(null);
     }
 
-    public void setParameters_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setParameters_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setParameters_Missing("parameters", opLambda, null);
     }
 
-    public void setParameters_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setParameters_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setParameters_Missing("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setParameters_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "parameters");
+        MissingAggregationBuilder builder = regMissingA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -862,22 +864,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String password
-
     public void setPassword_Terms() {
         setPassword_Terms(null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPassword_Terms("password", opLambda, null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPassword_Terms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "password");
+    public void setPassword_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -892,18 +893,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPassword_SignificantTerms(null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPassword_SignificantTerms("password", opLambda, null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPassword_SignificantTerms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "password");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -918,17 +919,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPassword_IpRange(null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPassword_IpRange("password", opLambda, null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPassword_IpRange("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "password");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -943,12 +944,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPassword_Count(null);
     }
 
-    public void setPassword_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPassword_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPassword_Count("password", opLambda);
     }
 
-    public void setPassword_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "password");
+    public void setPassword_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -958,12 +959,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPassword_Cardinality(null);
     }
 
-    public void setPassword_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPassword_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPassword_Cardinality("password", opLambda);
     }
 
-    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "password");
+    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -973,17 +974,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPassword_Missing(null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPassword_Missing("password", opLambda, null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPassword_Missing("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "password");
+        MissingAggregationBuilder builder = regMissingA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -994,17 +995,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // Integer port
     public void setPort_Avg() {
         setPort_Avg(null);
     }
 
-    public void setPort_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setPort_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setPort_Avg("port", opLambda);
     }
 
-    public void setPort_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "port");
+    public void setPort_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1014,12 +1014,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Max(null);
     }
 
-    public void setPort_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setPort_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setPort_Max("port", opLambda);
     }
 
-    public void setPort_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "port");
+    public void setPort_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1029,12 +1029,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Min(null);
     }
 
-    public void setPort_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setPort_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setPort_Min("port", opLambda);
     }
 
-    public void setPort_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "port");
+    public void setPort_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1044,12 +1044,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Sum(null);
     }
 
-    public void setPort_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setPort_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setPort_Sum("port", opLambda);
     }
 
-    public void setPort_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "port");
+    public void setPort_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1059,12 +1059,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_ExtendedStats(null);
     }
 
-    public void setPort_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setPort_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setPort_ExtendedStats("port", opLambda);
     }
 
-    public void setPort_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "port");
+    public void setPort_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1074,12 +1074,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Stats(null);
     }
 
-    public void setPort_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setPort_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setPort_Stats("port", opLambda);
     }
 
-    public void setPort_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "port");
+    public void setPort_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,12 +1089,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Percentiles(null);
     }
 
-    public void setPort_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setPort_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setPort_Percentiles("port", opLambda);
     }
 
-    public void setPort_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "port");
+    public void setPort_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1104,12 +1104,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_PercentileRanks(null);
     }
 
-    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setPort_PercentileRanks("port", opLambda);
     }
 
-    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "port");
+    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1119,17 +1119,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Histogram(null);
     }
 
-    public void setPort_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setPort_Histogram("port", opLambda, null);
     }
 
-    public void setPort_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPort_Histogram("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setPort_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "port");
+        HistogramAggregationBuilder builder = regHistogramA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1144,16 +1144,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Range(null);
     }
 
-    public void setPort_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setPort_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setPort_Range("port", opLambda, null);
     }
 
-    public void setPort_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPort_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPort_Range("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "port");
+    public void setPort_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1168,12 +1169,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Count(null);
     }
 
-    public void setPort_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPort_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPort_Count("port", opLambda);
     }
 
-    public void setPort_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "port");
+    public void setPort_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1183,12 +1184,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Cardinality(null);
     }
 
-    public void setPort_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPort_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPort_Cardinality("port", opLambda);
     }
 
-    public void setPort_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "port");
+    public void setPort_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1198,16 +1199,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setPort_Missing(null);
     }
 
-    public void setPort_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPort_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPort_Missing("port", opLambda, null);
     }
 
-    public void setPort_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setPort_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setPort_Missing("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "port");
+    public void setPort_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1218,23 +1220,22 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String protocolScheme
-
     public void setProtocolScheme_Terms() {
         setProtocolScheme_Terms(null);
     }
 
-    public void setProtocolScheme_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setProtocolScheme_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setProtocolScheme_Terms("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setProtocolScheme_Terms("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setProtocolScheme_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "protocolScheme");
+        TermsAggregationBuilder builder = regTermsA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1249,18 +1250,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setProtocolScheme_SignificantTerms(null);
     }
 
-    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setProtocolScheme_SignificantTerms("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setProtocolScheme_SignificantTerms("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProtocolScheme_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "protocolScheme");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1275,17 +1276,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setProtocolScheme_IpRange(null);
     }
 
-    public void setProtocolScheme_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setProtocolScheme_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setProtocolScheme_IpRange("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setProtocolScheme_IpRange("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setProtocolScheme_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "protocolScheme");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1300,12 +1302,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setProtocolScheme_Count(null);
     }
 
-    public void setProtocolScheme_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setProtocolScheme_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setProtocolScheme_Count("protocolScheme", opLambda);
     }
 
-    public void setProtocolScheme_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "protocolScheme");
+    public void setProtocolScheme_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1315,12 +1317,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setProtocolScheme_Cardinality(null);
     }
 
-    public void setProtocolScheme_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setProtocolScheme_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setProtocolScheme_Cardinality("protocolScheme", opLambda);
     }
 
-    public void setProtocolScheme_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "protocolScheme");
+    public void setProtocolScheme_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1330,17 +1332,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setProtocolScheme_Missing(null);
     }
 
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setProtocolScheme_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setProtocolScheme_Missing("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setProtocolScheme_Missing("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setProtocolScheme_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "protocolScheme");
+        MissingAggregationBuilder builder = regMissingA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,22 +1354,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1381,18 +1383,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1407,17 +1409,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1432,12 +1435,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1447,12 +1450,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1462,17 +1465,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1483,17 +1487,16 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,12 +1506,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1518,12 +1521,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1533,12 +1536,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1548,12 +1551,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1563,12 +1566,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1578,12 +1581,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1593,12 +1596,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1608,17 +1611,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1633,17 +1637,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda,
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1658,12 +1662,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1673,12 +1677,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1688,17 +1692,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1709,22 +1714,21 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         }
     }
 
-    // String username
-
     public void setUsername_Terms() {
         setUsername_Terms(null);
     }
 
-    public void setUsername_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUsername_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUsername_Terms("username", opLambda, null);
     }
 
-    public void setUsername_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUsername_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUsername_Terms("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "username");
+    public void setUsername_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1739,18 +1743,18 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUsername_SignificantTerms(null);
     }
 
-    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUsername_SignificantTerms("username", opLambda, null);
     }
 
-    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUsername_SignificantTerms("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUsername_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "username");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1765,17 +1769,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUsername_IpRange(null);
     }
 
-    public void setUsername_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUsername_IpRange("username", opLambda, null);
     }
 
-    public void setUsername_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUsername_IpRange("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUsername_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "username");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1790,12 +1794,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUsername_Count(null);
     }
 
-    public void setUsername_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUsername_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUsername_Count("username", opLambda);
     }
 
-    public void setUsername_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "username");
+    public void setUsername_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1805,12 +1809,12 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUsername_Cardinality(null);
     }
 
-    public void setUsername_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUsername_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUsername_Cardinality("username", opLambda);
     }
 
-    public void setUsername_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "username");
+    public void setUsername_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1820,17 +1824,17 @@ public abstract class BsFileAuthenticationCA extends EsAbstractConditionAggregat
         setUsername_Missing(null);
     }
 
-    public void setUsername_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUsername_Missing("username", opLambda, null);
     }
 
-    public void setUsername_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
+    public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileAuthenticationCA> aggsLambda) {
         setUsername_Missing("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUsername_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "username");
+        MissingAggregationBuilder builder = regMissingA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
index 6bf039ab052981fb9dfeab374c6721092ec1f02c..c8f9bdcdaee192cb715b20e98cdd9d079f1a2048 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.FileConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Boolean available
     public void setAvailable_Avg() {
         setAvailable_Avg(null);
     }
 
-    public void setAvailable_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setAvailable_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setAvailable_Avg("available", opLambda);
     }
 
-    public void setAvailable_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "available");
+    public void setAvailable_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Max(null);
     }
 
-    public void setAvailable_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setAvailable_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setAvailable_Max("available", opLambda);
     }
 
-    public void setAvailable_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "available");
+    public void setAvailable_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Min(null);
     }
 
-    public void setAvailable_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setAvailable_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setAvailable_Min("available", opLambda);
     }
 
-    public void setAvailable_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "available");
+    public void setAvailable_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Sum(null);
     }
 
-    public void setAvailable_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setAvailable_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setAvailable_Sum("available", opLambda);
     }
 
-    public void setAvailable_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "available");
+    public void setAvailable_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_ExtendedStats(null);
     }
 
-    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setAvailable_ExtendedStats("available", opLambda);
     }
 
-    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "available");
+    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Stats(null);
     }
 
-    public void setAvailable_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setAvailable_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setAvailable_Stats("available", opLambda);
     }
 
-    public void setAvailable_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "available");
+    public void setAvailable_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Percentiles(null);
     }
 
-    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setAvailable_Percentiles("available", opLambda);
     }
 
-    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "available");
+    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_PercentileRanks(null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setAvailable_PercentileRanks("available", opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Histogram(null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setAvailable_Histogram("available", opLambda, null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setAvailable_Histogram("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "available");
+    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Range(null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setAvailable_Range("available", opLambda, null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setAvailable_Range("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "available");
+    public void setAvailable_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +280,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Count(null);
     }
 
-    public void setAvailable_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAvailable_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAvailable_Count("available", opLambda);
     }
 
-    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "available");
+    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +295,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Cardinality(null);
     }
 
-    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAvailable_Cardinality("available", opLambda);
     }
 
-    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "available");
+    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +310,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Missing(null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAvailable_Missing("available", opLambda, null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setAvailable_Missing("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "available");
+    public void setAvailable_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,17 +331,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Float boost
     public void setBoost_Avg() {
         setBoost_Avg(null);
     }
 
-    public void setBoost_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setBoost_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setBoost_Avg("boost", opLambda);
     }
 
-    public void setBoost_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "boost");
+    public void setBoost_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +350,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Max(null);
     }
 
-    public void setBoost_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setBoost_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setBoost_Max("boost", opLambda);
     }
 
-    public void setBoost_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "boost");
+    public void setBoost_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,12 +365,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Min(null);
     }
 
-    public void setBoost_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setBoost_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setBoost_Min("boost", opLambda);
     }
 
-    public void setBoost_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "boost");
+    public void setBoost_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -379,12 +380,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Sum(null);
     }
 
-    public void setBoost_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setBoost_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setBoost_Sum("boost", opLambda);
     }
 
-    public void setBoost_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "boost");
+    public void setBoost_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -394,12 +395,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_ExtendedStats(null);
     }
 
-    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setBoost_ExtendedStats("boost", opLambda);
     }
 
-    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "boost");
+    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -409,12 +410,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Stats(null);
     }
 
-    public void setBoost_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setBoost_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setBoost_Stats("boost", opLambda);
     }
 
-    public void setBoost_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "boost");
+    public void setBoost_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,12 +425,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Percentiles(null);
     }
 
-    public void setBoost_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setBoost_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setBoost_Percentiles("boost", opLambda);
     }
 
-    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "boost");
+    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -439,12 +440,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_PercentileRanks(null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setBoost_PercentileRanks("boost", opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -454,16 +455,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Histogram(null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setBoost_Histogram("boost", opLambda, null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setBoost_Histogram("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "boost");
+    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,16 +480,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Range(null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setBoost_Range("boost", opLambda, null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setBoost_Range("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "boost");
+    public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,12 +504,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Count(null);
     }
 
-    public void setBoost_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoost_Count("boost", opLambda);
     }
 
-    public void setBoost_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boost");
+    public void setBoost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -517,12 +519,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Cardinality(null);
     }
 
-    public void setBoost_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoost_Cardinality("boost", opLambda);
     }
 
-    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boost");
+    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -532,16 +534,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setBoost_Missing(null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoost_Missing("boost", opLambda, null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setBoost_Missing("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boost");
+    public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,22 +555,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String configParameter
-
     public void setConfigParameter_Terms() {
         setConfigParameter_Terms(null);
     }
 
-    public void setConfigParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setConfigParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setConfigParameter_Terms("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setConfigParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setConfigParameter_Terms("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "configParameter");
+    public void setConfigParameter_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -582,18 +584,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_SignificantTerms(null);
     }
 
-    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setConfigParameter_SignificantTerms("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setConfigParameter_SignificantTerms("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setConfigParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "configParameter");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -608,17 +610,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_IpRange(null);
     }
 
-    public void setConfigParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setConfigParameter_IpRange("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setConfigParameter_IpRange("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setConfigParameter_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "configParameter");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +635,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Count(null);
     }
 
-    public void setConfigParameter_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setConfigParameter_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setConfigParameter_Count("configParameter", opLambda);
     }
 
-    public void setConfigParameter_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "configParameter");
+    public void setConfigParameter_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +650,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Cardinality(null);
     }
 
-    public void setConfigParameter_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setConfigParameter_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setConfigParameter_Cardinality("configParameter", opLambda);
     }
 
-    public void setConfigParameter_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "configParameter");
+    public void setConfigParameter_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,17 +665,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Missing(null);
     }
 
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setConfigParameter_Missing("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setConfigParameter_Missing("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setConfigParameter_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "configParameter");
+        MissingAggregationBuilder builder = regMissingA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -684,22 +686,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -714,17 +715,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -739,16 +741,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,12 +766,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,12 +781,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -793,16 +796,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -813,17 +817,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -833,12 +836,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,12 +851,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -863,12 +866,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -878,12 +881,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,12 +896,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -908,12 +911,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -923,12 +926,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,17 +941,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -963,16 +966,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -987,12 +991,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1002,12 +1006,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1017,16 +1021,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1037,17 +1042,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer depth
     public void setDepth_Avg() {
         setDepth_Avg(null);
     }
 
-    public void setDepth_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setDepth_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setDepth_Avg("depth", opLambda);
     }
 
-    public void setDepth_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "depth");
+    public void setDepth_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,12 +1061,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Max(null);
     }
 
-    public void setDepth_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setDepth_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setDepth_Max("depth", opLambda);
     }
 
-    public void setDepth_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "depth");
+    public void setDepth_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1072,12 +1076,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Min(null);
     }
 
-    public void setDepth_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setDepth_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setDepth_Min("depth", opLambda);
     }
 
-    public void setDepth_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "depth");
+    public void setDepth_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1087,12 +1091,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Sum(null);
     }
 
-    public void setDepth_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setDepth_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setDepth_Sum("depth", opLambda);
     }
 
-    public void setDepth_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "depth");
+    public void setDepth_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,12 +1106,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_ExtendedStats(null);
     }
 
-    public void setDepth_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setDepth_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setDepth_ExtendedStats("depth", opLambda);
     }
 
-    public void setDepth_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "depth");
+    public void setDepth_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1117,12 +1121,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Stats(null);
     }
 
-    public void setDepth_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setDepth_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setDepth_Stats("depth", opLambda);
     }
 
-    public void setDepth_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "depth");
+    public void setDepth_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1132,12 +1136,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Percentiles(null);
     }
 
-    public void setDepth_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setDepth_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setDepth_Percentiles("depth", opLambda);
     }
 
-    public void setDepth_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "depth");
+    public void setDepth_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1147,12 +1151,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_PercentileRanks(null);
     }
 
-    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setDepth_PercentileRanks("depth", opLambda);
     }
 
-    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "depth");
+    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1162,16 +1166,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Histogram(null);
     }
 
-    public void setDepth_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setDepth_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setDepth_Histogram("depth", opLambda, null);
     }
 
-    public void setDepth_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setDepth_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setDepth_Histogram("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "depth");
+    public void setDepth_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1186,16 +1191,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Range(null);
     }
 
-    public void setDepth_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setDepth_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setDepth_Range("depth", opLambda, null);
     }
 
-    public void setDepth_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setDepth_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setDepth_Range("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "depth");
+    public void setDepth_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1210,12 +1215,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Count(null);
     }
 
-    public void setDepth_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDepth_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDepth_Count("depth", opLambda);
     }
 
-    public void setDepth_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "depth");
+    public void setDepth_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1225,12 +1230,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Cardinality(null);
     }
 
-    public void setDepth_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDepth_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDepth_Cardinality("depth", opLambda);
     }
 
-    public void setDepth_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "depth");
+    public void setDepth_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1240,16 +1245,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setDepth_Missing(null);
     }
 
-    public void setDepth_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDepth_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDepth_Missing("depth", opLambda, null);
     }
 
-    public void setDepth_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setDepth_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setDepth_Missing("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "depth");
+    public void setDepth_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1260,22 +1266,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String excludedDocPaths
-
     public void setExcludedDocPaths_Terms() {
         setExcludedDocPaths_Terms(null);
     }
 
-    public void setExcludedDocPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setExcludedDocPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setExcludedDocPaths_Terms("excludedDocPaths", opLambda, null);
     }
 
-    public void setExcludedDocPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedDocPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedDocPaths_Terms("excludedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "excludedDocPaths");
+    public void setExcludedDocPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1290,18 +1295,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocPaths_SignificantTerms(null);
     }
 
-    public void setExcludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setExcludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setExcludedDocPaths_SignificantTerms("excludedDocPaths", opLambda, null);
     }
 
-    public void setExcludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedDocPaths_SignificantTerms("excludedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedDocPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "excludedDocPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1316,17 +1321,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocPaths_IpRange(null);
     }
 
-    public void setExcludedDocPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setExcludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setExcludedDocPaths_IpRange("excludedDocPaths", opLambda, null);
     }
 
-    public void setExcludedDocPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedDocPaths_IpRange("excludedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setExcludedDocPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "excludedDocPaths");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1341,12 +1346,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocPaths_Count(null);
     }
 
-    public void setExcludedDocPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExcludedDocPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExcludedDocPaths_Count("excludedDocPaths", opLambda);
     }
 
-    public void setExcludedDocPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "excludedDocPaths");
+    public void setExcludedDocPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1356,12 +1361,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocPaths_Cardinality(null);
     }
 
-    public void setExcludedDocPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExcludedDocPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExcludedDocPaths_Cardinality("excludedDocPaths", opLambda);
     }
 
-    public void setExcludedDocPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "excludedDocPaths");
+    public void setExcludedDocPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1371,17 +1376,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocPaths_Missing(null);
     }
 
-    public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExcludedDocPaths_Missing("excludedDocPaths", opLambda, null);
     }
 
-    public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedDocPaths_Missing("excludedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setExcludedDocPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "excludedDocPaths");
+        MissingAggregationBuilder builder = regMissingA(name, "excludedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1392,22 +1397,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String excludedPaths
-
     public void setExcludedPaths_Terms() {
         setExcludedPaths_Terms(null);
     }
 
-    public void setExcludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setExcludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setExcludedPaths_Terms("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedPaths_Terms("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "excludedPaths");
+    public void setExcludedPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1422,18 +1426,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedPaths_SignificantTerms(null);
     }
 
-    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setExcludedPaths_SignificantTerms("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedPaths_SignificantTerms("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "excludedPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,17 +1452,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedPaths_IpRange(null);
     }
 
-    public void setExcludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setExcludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setExcludedPaths_IpRange("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedPaths_IpRange("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setExcludedPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "excludedPaths");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1473,12 +1477,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Count(null);
     }
 
-    public void setExcludedPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExcludedPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExcludedPaths_Count("excludedPaths", opLambda);
     }
 
-    public void setExcludedPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "excludedPaths");
+    public void setExcludedPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1488,12 +1492,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Cardinality(null);
     }
 
-    public void setExcludedPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExcludedPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExcludedPaths_Cardinality("excludedPaths", opLambda);
     }
 
-    public void setExcludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "excludedPaths");
+    public void setExcludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,16 +1507,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Missing(null);
     }
 
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExcludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExcludedPaths_Missing("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setExcludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setExcludedPaths_Missing("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "excludedPaths");
+    public void setExcludedPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1523,22 +1528,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String includedDocPaths
-
     public void setIncludedDocPaths_Terms() {
         setIncludedDocPaths_Terms(null);
     }
 
-    public void setIncludedDocPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setIncludedDocPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setIncludedDocPaths_Terms("includedDocPaths", opLambda, null);
     }
 
-    public void setIncludedDocPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedDocPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedDocPaths_Terms("includedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "includedDocPaths");
+    public void setIncludedDocPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1553,18 +1557,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocPaths_SignificantTerms(null);
     }
 
-    public void setIncludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setIncludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setIncludedDocPaths_SignificantTerms("includedDocPaths", opLambda, null);
     }
 
-    public void setIncludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedDocPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedDocPaths_SignificantTerms("includedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedDocPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "includedDocPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1579,17 +1583,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocPaths_IpRange(null);
     }
 
-    public void setIncludedDocPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setIncludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setIncludedDocPaths_IpRange("includedDocPaths", opLambda, null);
     }
 
-    public void setIncludedDocPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedDocPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedDocPaths_IpRange("includedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setIncludedDocPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "includedDocPaths");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1604,12 +1608,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocPaths_Count(null);
     }
 
-    public void setIncludedDocPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIncludedDocPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIncludedDocPaths_Count("includedDocPaths", opLambda);
     }
 
-    public void setIncludedDocPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "includedDocPaths");
+    public void setIncludedDocPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1619,12 +1623,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocPaths_Cardinality(null);
     }
 
-    public void setIncludedDocPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIncludedDocPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIncludedDocPaths_Cardinality("includedDocPaths", opLambda);
     }
 
-    public void setIncludedDocPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "includedDocPaths");
+    public void setIncludedDocPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1634,17 +1638,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocPaths_Missing(null);
     }
 
-    public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIncludedDocPaths_Missing("includedDocPaths", opLambda, null);
     }
 
-    public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedDocPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedDocPaths_Missing("includedDocPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setIncludedDocPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "includedDocPaths");
+        MissingAggregationBuilder builder = regMissingA(name, "includedDocPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,22 +1659,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String includedPaths
-
     public void setIncludedPaths_Terms() {
         setIncludedPaths_Terms(null);
     }
 
-    public void setIncludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setIncludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setIncludedPaths_Terms("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedPaths_Terms("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "includedPaths");
+    public void setIncludedPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1685,18 +1688,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedPaths_SignificantTerms(null);
     }
 
-    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setIncludedPaths_SignificantTerms("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedPaths_SignificantTerms("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "includedPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1711,17 +1714,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedPaths_IpRange(null);
     }
 
-    public void setIncludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setIncludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setIncludedPaths_IpRange("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedPaths_IpRange("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setIncludedPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "includedPaths");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1736,12 +1739,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Count(null);
     }
 
-    public void setIncludedPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIncludedPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIncludedPaths_Count("includedPaths", opLambda);
     }
 
-    public void setIncludedPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "includedPaths");
+    public void setIncludedPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1751,12 +1754,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Cardinality(null);
     }
 
-    public void setIncludedPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIncludedPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIncludedPaths_Cardinality("includedPaths", opLambda);
     }
 
-    public void setIncludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "includedPaths");
+    public void setIncludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1766,16 +1769,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Missing(null);
     }
 
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIncludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIncludedPaths_Missing("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIncludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIncludedPaths_Missing("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "includedPaths");
+    public void setIncludedPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1786,17 +1790,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer intervalTime
     public void setIntervalTime_Avg() {
         setIntervalTime_Avg(null);
     }
 
-    public void setIntervalTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setIntervalTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setIntervalTime_Avg("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "intervalTime");
+    public void setIntervalTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1806,12 +1809,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Max(null);
     }
 
-    public void setIntervalTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setIntervalTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setIntervalTime_Max("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "intervalTime");
+    public void setIntervalTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1821,12 +1824,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Min(null);
     }
 
-    public void setIntervalTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setIntervalTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setIntervalTime_Min("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "intervalTime");
+    public void setIntervalTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1836,12 +1839,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Sum(null);
     }
 
-    public void setIntervalTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setIntervalTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setIntervalTime_Sum("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "intervalTime");
+    public void setIntervalTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1851,12 +1854,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_ExtendedStats(null);
     }
 
-    public void setIntervalTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setIntervalTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setIntervalTime_ExtendedStats("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "intervalTime");
+    public void setIntervalTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1866,12 +1869,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Stats(null);
     }
 
-    public void setIntervalTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setIntervalTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setIntervalTime_Stats("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "intervalTime");
+    public void setIntervalTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1881,12 +1884,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Percentiles(null);
     }
 
-    public void setIntervalTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setIntervalTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setIntervalTime_Percentiles("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "intervalTime");
+    public void setIntervalTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1896,12 +1899,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_PercentileRanks(null);
     }
 
-    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setIntervalTime_PercentileRanks("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "intervalTime");
+    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1911,17 +1914,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Histogram(null);
     }
 
-    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setIntervalTime_Histogram("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIntervalTime_Histogram("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setIntervalTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "intervalTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1936,16 +1939,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Range(null);
     }
 
-    public void setIntervalTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setIntervalTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setIntervalTime_Range("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIntervalTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIntervalTime_Range("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "intervalTime");
+    public void setIntervalTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1960,12 +1964,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Count(null);
     }
 
-    public void setIntervalTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIntervalTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIntervalTime_Count("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "intervalTime");
+    public void setIntervalTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1975,12 +1979,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Cardinality(null);
     }
 
-    public void setIntervalTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIntervalTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIntervalTime_Cardinality("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "intervalTime");
+    public void setIntervalTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1990,16 +1994,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Missing(null);
     }
 
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIntervalTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIntervalTime_Missing("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setIntervalTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setIntervalTime_Missing("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "intervalTime");
+    public void setIntervalTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2010,17 +2015,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer timeToLive
     public void setTimeToLive_Avg() {
         setTimeToLive_Avg(null);
     }
 
-    public void setTimeToLive_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setTimeToLive_Avg("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "timeToLive");
+    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2030,12 +2034,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Max(null);
     }
 
-    public void setTimeToLive_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setTimeToLive_Max("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "timeToLive");
+    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2045,12 +2049,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Min(null);
     }
 
-    public void setTimeToLive_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setTimeToLive_Min("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "timeToLive");
+    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2060,12 +2064,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Sum(null);
     }
 
-    public void setTimeToLive_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setTimeToLive_Sum("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "timeToLive");
+    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2075,12 +2079,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_ExtendedStats(null);
     }
 
-    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setTimeToLive_ExtendedStats("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "timeToLive");
+    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2090,12 +2094,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Stats(null);
     }
 
-    public void setTimeToLive_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setTimeToLive_Stats("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "timeToLive");
+    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2105,12 +2109,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Percentiles(null);
     }
 
-    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setTimeToLive_Percentiles("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "timeToLive");
+    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2120,12 +2124,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_PercentileRanks(null);
     }
 
-    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setTimeToLive_PercentileRanks("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "timeToLive");
+    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2135,16 +2139,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Histogram(null);
     }
 
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setTimeToLive_Histogram("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "timeToLive");
+    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2159,16 +2164,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Range(null);
     }
 
-    public void setTimeToLive_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setTimeToLive_Range("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "timeToLive");
+    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2183,12 +2189,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Count(null);
     }
 
-    public void setTimeToLive_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTimeToLive_Count("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "timeToLive");
+    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2198,12 +2204,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Cardinality(null);
     }
 
-    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTimeToLive_Cardinality("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "timeToLive");
+    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2213,16 +2219,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Missing(null);
     }
 
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTimeToLive_Missing("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "timeToLive");
+    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,17 +2240,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long maxAccessCount
     public void setMaxAccessCount_Avg() {
         setMaxAccessCount_Avg(null);
     }
 
-    public void setMaxAccessCount_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setMaxAccessCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setMaxAccessCount_Avg("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "maxAccessCount");
+    public void setMaxAccessCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2253,12 +2259,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Max(null);
     }
 
-    public void setMaxAccessCount_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setMaxAccessCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setMaxAccessCount_Max("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "maxAccessCount");
+    public void setMaxAccessCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2268,12 +2274,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Min(null);
     }
 
-    public void setMaxAccessCount_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setMaxAccessCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setMaxAccessCount_Min("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "maxAccessCount");
+    public void setMaxAccessCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2283,12 +2289,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Sum(null);
     }
 
-    public void setMaxAccessCount_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setMaxAccessCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setMaxAccessCount_Sum("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "maxAccessCount");
+    public void setMaxAccessCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2298,12 +2304,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_ExtendedStats(null);
     }
 
-    public void setMaxAccessCount_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setMaxAccessCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setMaxAccessCount_ExtendedStats("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "maxAccessCount");
+    public void setMaxAccessCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2313,12 +2319,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Stats(null);
     }
 
-    public void setMaxAccessCount_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setMaxAccessCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setMaxAccessCount_Stats("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "maxAccessCount");
+    public void setMaxAccessCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2328,12 +2334,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Percentiles(null);
     }
 
-    public void setMaxAccessCount_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setMaxAccessCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setMaxAccessCount_Percentiles("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "maxAccessCount");
+    public void setMaxAccessCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2343,12 +2349,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_PercentileRanks(null);
     }
 
-    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setMaxAccessCount_PercentileRanks("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "maxAccessCount");
+    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2358,17 +2364,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Histogram(null);
     }
 
-    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setMaxAccessCount_Histogram("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
         setMaxAccessCount_Histogram("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setMaxAccessCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "maxAccessCount");
+        HistogramAggregationBuilder builder = regHistogramA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2383,16 +2390,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Range(null);
     }
 
-    public void setMaxAccessCount_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setMaxAccessCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setMaxAccessCount_Range("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setMaxAccessCount_Range("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "maxAccessCount");
+    public void setMaxAccessCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2407,12 +2415,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Count(null);
     }
 
-    public void setMaxAccessCount_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setMaxAccessCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setMaxAccessCount_Count("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "maxAccessCount");
+    public void setMaxAccessCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2422,12 +2430,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Cardinality(null);
     }
 
-    public void setMaxAccessCount_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setMaxAccessCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setMaxAccessCount_Cardinality("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "maxAccessCount");
+    public void setMaxAccessCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2437,16 +2445,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Missing(null);
     }
 
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setMaxAccessCount_Missing("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setMaxAccessCount_Missing("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "maxAccessCount");
+    public void setMaxAccessCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2457,22 +2466,20 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2487,17 +2494,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2512,16 +2520,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2536,12 +2545,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2551,12 +2560,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2566,16 +2575,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2586,17 +2596,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer numOfThread
     public void setNumOfThread_Avg() {
         setNumOfThread_Avg(null);
     }
 
-    public void setNumOfThread_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setNumOfThread_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setNumOfThread_Avg("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "numOfThread");
+    public void setNumOfThread_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2606,12 +2615,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Max(null);
     }
 
-    public void setNumOfThread_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setNumOfThread_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setNumOfThread_Max("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "numOfThread");
+    public void setNumOfThread_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2621,12 +2630,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Min(null);
     }
 
-    public void setNumOfThread_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setNumOfThread_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setNumOfThread_Min("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "numOfThread");
+    public void setNumOfThread_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2636,12 +2645,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Sum(null);
     }
 
-    public void setNumOfThread_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setNumOfThread_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setNumOfThread_Sum("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "numOfThread");
+    public void setNumOfThread_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2651,12 +2660,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_ExtendedStats(null);
     }
 
-    public void setNumOfThread_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setNumOfThread_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setNumOfThread_ExtendedStats("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "numOfThread");
+    public void setNumOfThread_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2666,12 +2675,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Stats(null);
     }
 
-    public void setNumOfThread_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setNumOfThread_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setNumOfThread_Stats("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "numOfThread");
+    public void setNumOfThread_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2681,12 +2690,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Percentiles(null);
     }
 
-    public void setNumOfThread_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setNumOfThread_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setNumOfThread_Percentiles("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "numOfThread");
+    public void setNumOfThread_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2696,12 +2705,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_PercentileRanks(null);
     }
 
-    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setNumOfThread_PercentileRanks("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "numOfThread");
+    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2711,17 +2720,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Histogram(null);
     }
 
-    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setNumOfThread_Histogram("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setNumOfThread_Histogram("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setNumOfThread_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "numOfThread");
+        HistogramAggregationBuilder builder = regHistogramA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2736,16 +2745,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Range(null);
     }
 
-    public void setNumOfThread_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setNumOfThread_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setNumOfThread_Range("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setNumOfThread_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setNumOfThread_Range("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "numOfThread");
+    public void setNumOfThread_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2760,12 +2770,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Count(null);
     }
 
-    public void setNumOfThread_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setNumOfThread_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setNumOfThread_Count("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "numOfThread");
+    public void setNumOfThread_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2775,12 +2785,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Cardinality(null);
     }
 
-    public void setNumOfThread_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setNumOfThread_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setNumOfThread_Cardinality("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "numOfThread");
+    public void setNumOfThread_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2790,16 +2800,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Missing(null);
     }
 
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setNumOfThread_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setNumOfThread_Missing("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setNumOfThread_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setNumOfThread_Missing("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "numOfThread");
+    public void setNumOfThread_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2810,22 +2821,20 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String paths
-
     public void setPaths_Terms() {
         setPaths_Terms(null);
     }
 
-    public void setPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPaths_Terms("paths", opLambda, null);
     }
 
-    public void setPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPaths_Terms("paths", opLambda, aggsLambda);
     }
 
-    public void setPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "paths");
+    public void setPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2840,17 +2849,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPaths_SignificantTerms(null);
     }
 
-    public void setPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPaths_SignificantTerms("paths", opLambda, null);
     }
 
-    public void setPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
         setPaths_SignificantTerms("paths", opLambda, aggsLambda);
     }
 
-    public void setPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "paths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2865,16 +2875,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPaths_IpRange(null);
     }
 
-    public void setPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPaths_IpRange("paths", opLambda, null);
     }
 
-    public void setPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPaths_IpRange("paths", opLambda, aggsLambda);
     }
 
-    public void setPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "paths");
+    public void setPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2889,12 +2900,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPaths_Count(null);
     }
 
-    public void setPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPaths_Count("paths", opLambda);
     }
 
-    public void setPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "paths");
+    public void setPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2904,12 +2915,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPaths_Cardinality(null);
     }
 
-    public void setPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPaths_Cardinality("paths", opLambda);
     }
 
-    public void setPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "paths");
+    public void setPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2919,16 +2930,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPaths_Missing(null);
     }
 
-    public void setPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPaths_Missing("paths", opLambda, null);
     }
 
-    public void setPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPaths_Missing("paths", opLambda, aggsLambda);
     }
 
-    public void setPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "paths");
+    public void setPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "paths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2939,22 +2951,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2969,18 +2980,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2995,16 +3006,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3019,12 +3031,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3034,12 +3046,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3049,16 +3061,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3069,17 +3082,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3089,12 +3101,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3104,12 +3116,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3119,12 +3131,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3134,12 +3146,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3149,12 +3161,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3164,12 +3176,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3179,12 +3191,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3194,16 +3206,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3218,16 +3231,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3242,12 +3256,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3257,12 +3271,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3272,16 +3286,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3292,22 +3307,21 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3322,17 +3336,18 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3347,16 +3362,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3371,12 +3387,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3386,12 +3402,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3401,16 +3417,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3421,17 +3438,16 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3441,12 +3457,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3456,12 +3472,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3471,12 +3487,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3486,12 +3502,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3501,12 +3517,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3516,12 +3532,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3531,12 +3547,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3546,17 +3562,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3571,16 +3587,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3595,12 +3612,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3610,12 +3627,12 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3625,16 +3642,17 @@ public abstract class BsFileConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToLabelCA.java
index 5cfa2287335695c8c0aa57be25e7817beb980b18..fc146c70e1853128724db50aa008751c91801f72 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToLabelCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.FileConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,37 +82,35 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String fileConfigId
-
     public void setFileConfigId_Terms() {
         setFileConfigId_Terms(null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "fileConfigId");
+        TermsAggregationBuilder builder = regTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -127,18 +125,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_SignificantTerms(null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "fileConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -153,17 +151,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_IpRange(null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "fileConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -178,12 +177,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Count(null);
     }
 
-    public void setFileConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFileConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFileConfigId_Count("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "fileConfigId");
+    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -193,12 +192,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Cardinality(null);
     }
 
-    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFileConfigId_Cardinality("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "fileConfigId");
+    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -208,17 +207,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setFileConfigId_Missing(null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "fileConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -229,22 +229,21 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -259,18 +258,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,17 +284,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,12 +310,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -325,12 +325,12 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,17 +340,18 @@ public abstract class BsFileConfigToLabelCA extends EsAbstractConditionAggregati
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToRoleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToRoleCA.java
index 66543b4a9000b023fdd6fb744aae5d2c1f0e9fb7..2bb4bbda1be237c0ca36e5b6d0468ccd95bba57e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsFileConfigToRoleCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.FileConfigToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.FileConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsFileConfigToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String fileConfigId
-
     public void setFileConfigId_Terms() {
         setFileConfigId_Terms(null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_Terms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "fileConfigId");
+    public void setFileConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_SignificantTerms(null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_SignificantTerms("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFileConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "fileConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_IpRange(null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_IpRange("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFileConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "fileConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Count(null);
     }
 
-    public void setFileConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFileConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFileConfigId_Count("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "fileConfigId");
+    public void setFileConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Cardinality(null);
     }
 
-    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFileConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFileConfigId_Cardinality("fileConfigId", opLambda);
     }
 
-    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "fileConfigId");
+    public void setFileConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setFileConfigId_Missing(null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, null);
     }
 
-    public void setFileConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setFileConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setFileConfigId_Missing("fileConfigId", opLambda, aggsLambda);
     }
 
-    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFileConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "fileConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "fileConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,17 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +309,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +324,12 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +339,17 @@ public abstract class BsFileConfigToRoleCA extends EsAbstractConditionAggregatio
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsFileConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
index d9cc4f46e05d39a125185dc0600239085183d333..a4f89312f3a307831b7ed12d33a3f83d1c934c41 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsJobLogCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.JobLogCA;
 import org.codelibs.fess.es.config.cbean.cq.JobLogCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsJobLogCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Long endTime
     public void setEndTime_Avg() {
         setEndTime_Avg(null);
     }
 
-    public void setEndTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setEndTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setEndTime_Avg("endTime", opLambda);
     }
 
-    public void setEndTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "endTime");
+    public void setEndTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Max(null);
     }
 
-    public void setEndTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setEndTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setEndTime_Max("endTime", opLambda);
     }
 
-    public void setEndTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "endTime");
+    public void setEndTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Min(null);
     }
 
-    public void setEndTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setEndTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setEndTime_Min("endTime", opLambda);
     }
 
-    public void setEndTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "endTime");
+    public void setEndTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Sum(null);
     }
 
-    public void setEndTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setEndTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setEndTime_Sum("endTime", opLambda);
     }
 
-    public void setEndTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "endTime");
+    public void setEndTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_ExtendedStats(null);
     }
 
-    public void setEndTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setEndTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setEndTime_ExtendedStats("endTime", opLambda);
     }
 
-    public void setEndTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "endTime");
+    public void setEndTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Stats(null);
     }
 
-    public void setEndTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setEndTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setEndTime_Stats("endTime", opLambda);
     }
 
-    public void setEndTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "endTime");
+    public void setEndTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Percentiles(null);
     }
 
-    public void setEndTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setEndTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setEndTime_Percentiles("endTime", opLambda);
     }
 
-    public void setEndTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "endTime");
+    public void setEndTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_PercentileRanks(null);
     }
 
-    public void setEndTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setEndTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setEndTime_PercentileRanks("endTime", opLambda);
     }
 
-    public void setEndTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "endTime");
+    public void setEndTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Histogram(null);
     }
 
-    public void setEndTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setEndTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setEndTime_Histogram("endTime", opLambda, null);
     }
 
-    public void setEndTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setEndTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setEndTime_Histogram("endTime", opLambda, aggsLambda);
     }
 
-    public void setEndTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "endTime");
+    public void setEndTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Range(null);
     }
 
-    public void setEndTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setEndTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setEndTime_Range("endTime", opLambda, null);
     }
 
-    public void setEndTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setEndTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setEndTime_Range("endTime", opLambda, aggsLambda);
     }
 
-    public void setEndTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "endTime");
+    public void setEndTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +279,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Count(null);
     }
 
-    public void setEndTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setEndTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setEndTime_Count("endTime", opLambda);
     }
 
-    public void setEndTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "endTime");
+    public void setEndTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +294,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Cardinality(null);
     }
 
-    public void setEndTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setEndTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setEndTime_Cardinality("endTime", opLambda);
     }
 
-    public void setEndTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "endTime");
+    public void setEndTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +309,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setEndTime_Missing(null);
     }
 
-    public void setEndTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setEndTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setEndTime_Missing("endTime", opLambda, null);
     }
 
-    public void setEndTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setEndTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setEndTime_Missing("endTime", opLambda, aggsLambda);
     }
 
-    public void setEndTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "endTime");
+    public void setEndTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "endTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,22 +329,20 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String jobName
-
     public void setJobName_Terms() {
         setJobName_Terms(null);
     }
 
-    public void setJobName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setJobName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setJobName_Terms("jobName", opLambda, null);
     }
 
-    public void setJobName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobName_Terms("jobName", opLambda, aggsLambda);
     }
 
-    public void setJobName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "jobName");
+    public void setJobName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -359,17 +357,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobName_SignificantTerms(null);
     }
 
-    public void setJobName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setJobName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setJobName_SignificantTerms("jobName", opLambda, null);
     }
 
-    public void setJobName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setJobName_SignificantTerms("jobName", opLambda, aggsLambda);
     }
 
-    public void setJobName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setJobName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "jobName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +383,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobName_IpRange(null);
     }
 
-    public void setJobName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setJobName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setJobName_IpRange("jobName", opLambda, null);
     }
 
-    public void setJobName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobName_IpRange("jobName", opLambda, aggsLambda);
     }
 
-    public void setJobName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "jobName");
+    public void setJobName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +407,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobName_Count(null);
     }
 
-    public void setJobName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setJobName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setJobName_Count("jobName", opLambda);
     }
 
-    public void setJobName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "jobName");
+    public void setJobName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +422,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobName_Cardinality(null);
     }
 
-    public void setJobName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setJobName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setJobName_Cardinality("jobName", opLambda);
     }
 
-    public void setJobName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "jobName");
+    public void setJobName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +437,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobName_Missing(null);
     }
 
-    public void setJobName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setJobName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setJobName_Missing("jobName", opLambda, null);
     }
 
-    public void setJobName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobName_Missing("jobName", opLambda, aggsLambda);
     }
 
-    public void setJobName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "jobName");
+    public void setJobName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "jobName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,22 +457,20 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String jobStatus
-
     public void setJobStatus_Terms() {
         setJobStatus_Terms(null);
     }
 
-    public void setJobStatus_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setJobStatus_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setJobStatus_Terms("jobStatus", opLambda, null);
     }
 
-    public void setJobStatus_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobStatus_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobStatus_Terms("jobStatus", opLambda, aggsLambda);
     }
 
-    public void setJobStatus_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "jobStatus");
+    public void setJobStatus_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,17 +485,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobStatus_SignificantTerms(null);
     }
 
-    public void setJobStatus_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setJobStatus_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setJobStatus_SignificantTerms("jobStatus", opLambda, null);
     }
 
-    public void setJobStatus_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobStatus_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setJobStatus_SignificantTerms("jobStatus", opLambda, aggsLambda);
     }
 
-    public void setJobStatus_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setJobStatus_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "jobStatus");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,16 +511,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobStatus_IpRange(null);
     }
 
-    public void setJobStatus_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setJobStatus_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setJobStatus_IpRange("jobStatus", opLambda, null);
     }
 
-    public void setJobStatus_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobStatus_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobStatus_IpRange("jobStatus", opLambda, aggsLambda);
     }
 
-    public void setJobStatus_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "jobStatus");
+    public void setJobStatus_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -537,12 +536,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobStatus_Count(null);
     }
 
-    public void setJobStatus_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setJobStatus_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setJobStatus_Count("jobStatus", opLambda);
     }
 
-    public void setJobStatus_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "jobStatus");
+    public void setJobStatus_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,12 +551,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobStatus_Cardinality(null);
     }
 
-    public void setJobStatus_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setJobStatus_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setJobStatus_Cardinality("jobStatus", opLambda);
     }
 
-    public void setJobStatus_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "jobStatus");
+    public void setJobStatus_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -567,16 +566,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setJobStatus_Missing(null);
     }
 
-    public void setJobStatus_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setJobStatus_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setJobStatus_Missing("jobStatus", opLambda, null);
     }
 
-    public void setJobStatus_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setJobStatus_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setJobStatus_Missing("jobStatus", opLambda, aggsLambda);
     }
 
-    public void setJobStatus_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "jobStatus");
+    public void setJobStatus_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "jobStatus");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,22 +587,20 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String scriptData
-
     public void setScriptData_Terms() {
         setScriptData_Terms(null);
     }
 
-    public void setScriptData_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setScriptData_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setScriptData_Terms("scriptData", opLambda, null);
     }
 
-    public void setScriptData_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptData_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptData_Terms("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "scriptData");
+    public void setScriptData_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -617,17 +615,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptData_SignificantTerms(null);
     }
 
-    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setScriptData_SignificantTerms("scriptData", opLambda, null);
     }
 
-    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptData_SignificantTerms("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptData_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "scriptData");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,16 +641,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptData_IpRange(null);
     }
 
-    public void setScriptData_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setScriptData_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setScriptData_IpRange("scriptData", opLambda, null);
     }
 
-    public void setScriptData_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptData_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptData_IpRange("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "scriptData");
+    public void setScriptData_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -666,12 +666,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptData_Count(null);
     }
 
-    public void setScriptData_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setScriptData_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setScriptData_Count("scriptData", opLambda);
     }
 
-    public void setScriptData_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "scriptData");
+    public void setScriptData_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -681,12 +681,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptData_Cardinality(null);
     }
 
-    public void setScriptData_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setScriptData_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setScriptData_Cardinality("scriptData", opLambda);
     }
 
-    public void setScriptData_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "scriptData");
+    public void setScriptData_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -696,16 +696,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptData_Missing(null);
     }
 
-    public void setScriptData_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setScriptData_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setScriptData_Missing("scriptData", opLambda, null);
     }
 
-    public void setScriptData_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptData_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptData_Missing("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "scriptData");
+    public void setScriptData_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,22 +717,21 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String scriptResult
-
     public void setScriptResult_Terms() {
         setScriptResult_Terms(null);
     }
 
-    public void setScriptResult_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setScriptResult_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setScriptResult_Terms("scriptResult", opLambda, null);
     }
 
-    public void setScriptResult_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptResult_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptResult_Terms("scriptResult", opLambda, aggsLambda);
     }
 
-    public void setScriptResult_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "scriptResult");
+    public void setScriptResult_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -746,17 +746,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptResult_SignificantTerms(null);
     }
 
-    public void setScriptResult_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setScriptResult_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setScriptResult_SignificantTerms("scriptResult", opLambda, null);
     }
 
-    public void setScriptResult_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptResult_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptResult_SignificantTerms("scriptResult", opLambda, aggsLambda);
     }
 
-    public void setScriptResult_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptResult_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "scriptResult");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -771,16 +772,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptResult_IpRange(null);
     }
 
-    public void setScriptResult_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setScriptResult_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setScriptResult_IpRange("scriptResult", opLambda, null);
     }
 
-    public void setScriptResult_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptResult_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptResult_IpRange("scriptResult", opLambda, aggsLambda);
     }
 
-    public void setScriptResult_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "scriptResult");
+    public void setScriptResult_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -795,12 +797,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptResult_Count(null);
     }
 
-    public void setScriptResult_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setScriptResult_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setScriptResult_Count("scriptResult", opLambda);
     }
 
-    public void setScriptResult_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "scriptResult");
+    public void setScriptResult_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -810,12 +812,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptResult_Cardinality(null);
     }
 
-    public void setScriptResult_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setScriptResult_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setScriptResult_Cardinality("scriptResult", opLambda);
     }
 
-    public void setScriptResult_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "scriptResult");
+    public void setScriptResult_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -825,16 +827,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptResult_Missing(null);
     }
 
-    public void setScriptResult_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setScriptResult_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setScriptResult_Missing("scriptResult", opLambda, null);
     }
 
-    public void setScriptResult_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptResult_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptResult_Missing("scriptResult", opLambda, aggsLambda);
     }
 
-    public void setScriptResult_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "scriptResult");
+    public void setScriptResult_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "scriptResult");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -845,22 +848,20 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String scriptType
-
     public void setScriptType_Terms() {
         setScriptType_Terms(null);
     }
 
-    public void setScriptType_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setScriptType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setScriptType_Terms("scriptType", opLambda, null);
     }
 
-    public void setScriptType_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptType_Terms("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "scriptType");
+    public void setScriptType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -875,17 +876,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptType_SignificantTerms(null);
     }
 
-    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setScriptType_SignificantTerms("scriptType", opLambda, null);
     }
 
-    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptType_SignificantTerms("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "scriptType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,16 +902,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptType_IpRange(null);
     }
 
-    public void setScriptType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setScriptType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setScriptType_IpRange("scriptType", opLambda, null);
     }
 
-    public void setScriptType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptType_IpRange("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "scriptType");
+    public void setScriptType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -924,12 +927,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptType_Count(null);
     }
 
-    public void setScriptType_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setScriptType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setScriptType_Count("scriptType", opLambda);
     }
 
-    public void setScriptType_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "scriptType");
+    public void setScriptType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,12 +942,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptType_Cardinality(null);
     }
 
-    public void setScriptType_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setScriptType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setScriptType_Cardinality("scriptType", opLambda);
     }
 
-    public void setScriptType_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "scriptType");
+    public void setScriptType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -954,16 +957,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setScriptType_Missing(null);
     }
 
-    public void setScriptType_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setScriptType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setScriptType_Missing("scriptType", opLambda, null);
     }
 
-    public void setScriptType_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setScriptType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setScriptType_Missing("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "scriptType");
+    public void setScriptType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -974,17 +978,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long startTime
     public void setStartTime_Avg() {
         setStartTime_Avg(null);
     }
 
-    public void setStartTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setStartTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setStartTime_Avg("startTime", opLambda);
     }
 
-    public void setStartTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "startTime");
+    public void setStartTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -994,12 +997,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Max(null);
     }
 
-    public void setStartTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setStartTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setStartTime_Max("startTime", opLambda);
     }
 
-    public void setStartTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "startTime");
+    public void setStartTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1009,12 +1012,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Min(null);
     }
 
-    public void setStartTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setStartTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setStartTime_Min("startTime", opLambda);
     }
 
-    public void setStartTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "startTime");
+    public void setStartTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1024,12 +1027,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Sum(null);
     }
 
-    public void setStartTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setStartTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setStartTime_Sum("startTime", opLambda);
     }
 
-    public void setStartTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "startTime");
+    public void setStartTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1039,12 +1042,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_ExtendedStats(null);
     }
 
-    public void setStartTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setStartTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setStartTime_ExtendedStats("startTime", opLambda);
     }
 
-    public void setStartTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "startTime");
+    public void setStartTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1054,12 +1057,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Stats(null);
     }
 
-    public void setStartTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setStartTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setStartTime_Stats("startTime", opLambda);
     }
 
-    public void setStartTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "startTime");
+    public void setStartTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1069,12 +1072,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Percentiles(null);
     }
 
-    public void setStartTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setStartTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setStartTime_Percentiles("startTime", opLambda);
     }
 
-    public void setStartTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "startTime");
+    public void setStartTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1084,12 +1087,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_PercentileRanks(null);
     }
 
-    public void setStartTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setStartTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setStartTime_PercentileRanks("startTime", opLambda);
     }
 
-    public void setStartTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "startTime");
+    public void setStartTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1099,16 +1102,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Histogram(null);
     }
 
-    public void setStartTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setStartTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setStartTime_Histogram("startTime", opLambda, null);
     }
 
-    public void setStartTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setStartTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setStartTime_Histogram("startTime", opLambda, aggsLambda);
     }
 
-    public void setStartTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "startTime");
+    public void setStartTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,16 +1127,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Range(null);
     }
 
-    public void setStartTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setStartTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setStartTime_Range("startTime", opLambda, null);
     }
 
-    public void setStartTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setStartTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setStartTime_Range("startTime", opLambda, aggsLambda);
     }
 
-    public void setStartTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "startTime");
+    public void setStartTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1147,12 +1151,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Count(null);
     }
 
-    public void setStartTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setStartTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setStartTime_Count("startTime", opLambda);
     }
 
-    public void setStartTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "startTime");
+    public void setStartTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1162,12 +1166,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Cardinality(null);
     }
 
-    public void setStartTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setStartTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setStartTime_Cardinality("startTime", opLambda);
     }
 
-    public void setStartTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "startTime");
+    public void setStartTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1177,16 +1181,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setStartTime_Missing(null);
     }
 
-    public void setStartTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setStartTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setStartTime_Missing("startTime", opLambda, null);
     }
 
-    public void setStartTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setStartTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setStartTime_Missing("startTime", opLambda, aggsLambda);
     }
 
-    public void setStartTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "startTime");
+    public void setStartTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "startTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1197,22 +1202,20 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String target
-
     public void setTarget_Terms() {
         setTarget_Terms(null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTarget_Terms("target", opLambda, null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setTarget_Terms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "target");
+    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1227,17 +1230,18 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setTarget_SignificantTerms(null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTarget_SignificantTerms("target", opLambda, null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
         setTarget_SignificantTerms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsJobLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "target");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,16 +1256,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setTarget_IpRange(null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTarget_IpRange("target", opLambda, null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setTarget_IpRange("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "target");
+    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1276,12 +1280,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setTarget_Count(null);
     }
 
-    public void setTarget_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTarget_Count("target", opLambda);
     }
 
-    public void setTarget_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "target");
+    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1291,12 +1295,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setTarget_Cardinality(null);
     }
 
-    public void setTarget_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTarget_Cardinality("target", opLambda);
     }
 
-    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "target");
+    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1306,16 +1310,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setTarget_Missing(null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTarget_Missing("target", opLambda, null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setTarget_Missing("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "target");
+    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1326,17 +1330,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long lastUpdated
     public void setLastUpdated_Avg() {
         setLastUpdated_Avg(null);
     }
 
-    public void setLastUpdated_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setLastUpdated_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setLastUpdated_Avg("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "lastUpdated");
+    public void setLastUpdated_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1346,12 +1349,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Max(null);
     }
 
-    public void setLastUpdated_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setLastUpdated_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setLastUpdated_Max("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "lastUpdated");
+    public void setLastUpdated_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1361,12 +1364,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Min(null);
     }
 
-    public void setLastUpdated_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setLastUpdated_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setLastUpdated_Min("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "lastUpdated");
+    public void setLastUpdated_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1376,12 +1379,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Sum(null);
     }
 
-    public void setLastUpdated_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setLastUpdated_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setLastUpdated_Sum("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "lastUpdated");
+    public void setLastUpdated_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1391,12 +1394,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_ExtendedStats(null);
     }
 
-    public void setLastUpdated_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setLastUpdated_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setLastUpdated_ExtendedStats("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "lastUpdated");
+    public void setLastUpdated_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1406,12 +1409,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Stats(null);
     }
 
-    public void setLastUpdated_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setLastUpdated_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setLastUpdated_Stats("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "lastUpdated");
+    public void setLastUpdated_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1421,12 +1424,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Percentiles(null);
     }
 
-    public void setLastUpdated_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setLastUpdated_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setLastUpdated_Percentiles("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "lastUpdated");
+    public void setLastUpdated_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1436,12 +1439,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_PercentileRanks(null);
     }
 
-    public void setLastUpdated_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setLastUpdated_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setLastUpdated_PercentileRanks("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "lastUpdated");
+    public void setLastUpdated_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1451,16 +1454,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Histogram(null);
     }
 
-    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setLastUpdated_Histogram("lastUpdated", opLambda, null);
     }
 
-    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setLastUpdated_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setLastUpdated_Histogram("lastUpdated", opLambda, aggsLambda);
     }
 
-    public void setLastUpdated_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "lastUpdated");
+    public void setLastUpdated_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1475,16 +1479,16 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Range(null);
     }
 
-    public void setLastUpdated_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setLastUpdated_Range("lastUpdated", opLambda, null);
     }
 
-    public void setLastUpdated_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setLastUpdated_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setLastUpdated_Range("lastUpdated", opLambda, aggsLambda);
     }
 
-    public void setLastUpdated_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "lastUpdated");
+    public void setLastUpdated_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1499,12 +1503,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Count(null);
     }
 
-    public void setLastUpdated_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLastUpdated_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLastUpdated_Count("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "lastUpdated");
+    public void setLastUpdated_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1514,12 +1518,12 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Cardinality(null);
     }
 
-    public void setLastUpdated_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLastUpdated_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLastUpdated_Cardinality("lastUpdated", opLambda);
     }
 
-    public void setLastUpdated_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "lastUpdated");
+    public void setLastUpdated_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1529,16 +1533,17 @@ public abstract class BsJobLogCA extends EsAbstractConditionAggregation {
         setLastUpdated_Missing(null);
     }
 
-    public void setLastUpdated_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLastUpdated_Missing("lastUpdated", opLambda, null);
     }
 
-    public void setLastUpdated_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
+    public void setLastUpdated_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
         setLastUpdated_Missing("lastUpdated", opLambda, aggsLambda);
     }
 
-    public void setLastUpdated_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsJobLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "lastUpdated");
+    public void setLastUpdated_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsJobLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "lastUpdated");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
index ce4fce8d925539b4bc4d37ddd7bf824066e35142..93e8105d25c39919d87f7cc30a4ca0cddb259459 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsKeyMatchCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.KeyMatchCA;
 import org.codelibs.fess.es.config.cbean.cq.KeyMatchCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsKeyMatchCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Float boost
     public void setBoost_Avg() {
         setBoost_Avg(null);
     }
 
-    public void setBoost_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setBoost_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setBoost_Avg("boost", opLambda);
     }
 
-    public void setBoost_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "boost");
+    public void setBoost_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Max(null);
     }
 
-    public void setBoost_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setBoost_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setBoost_Max("boost", opLambda);
     }
 
-    public void setBoost_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "boost");
+    public void setBoost_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Min(null);
     }
 
-    public void setBoost_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setBoost_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setBoost_Min("boost", opLambda);
     }
 
-    public void setBoost_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "boost");
+    public void setBoost_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Sum(null);
     }
 
-    public void setBoost_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setBoost_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setBoost_Sum("boost", opLambda);
     }
 
-    public void setBoost_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "boost");
+    public void setBoost_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_ExtendedStats(null);
     }
 
-    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setBoost_ExtendedStats("boost", opLambda);
     }
 
-    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "boost");
+    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Stats(null);
     }
 
-    public void setBoost_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setBoost_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setBoost_Stats("boost", opLambda);
     }
 
-    public void setBoost_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "boost");
+    public void setBoost_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Percentiles(null);
     }
 
-    public void setBoost_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setBoost_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setBoost_Percentiles("boost", opLambda);
     }
 
-    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "boost");
+    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_PercentileRanks(null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setBoost_PercentileRanks("boost", opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Histogram(null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setBoost_Histogram("boost", opLambda, null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setBoost_Histogram("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "boost");
+    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Range(null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setBoost_Range("boost", opLambda, null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setBoost_Range("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "boost");
+    public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +279,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Count(null);
     }
 
-    public void setBoost_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoost_Count("boost", opLambda);
     }
 
-    public void setBoost_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boost");
+    public void setBoost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +294,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Cardinality(null);
     }
 
-    public void setBoost_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoost_Cardinality("boost", opLambda);
     }
 
-    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boost");
+    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +309,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setBoost_Missing(null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoost_Missing("boost", opLambda, null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setBoost_Missing("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boost");
+    public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,22 +329,20 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -359,17 +357,18 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsKeyMatchCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +383,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +408,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +423,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +438,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,17 +459,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,12 +478,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -493,12 +493,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -508,12 +508,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,12 +523,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -538,12 +538,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -553,12 +553,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -568,12 +568,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -583,16 +583,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -607,16 +608,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,12 +633,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -646,12 +648,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -661,16 +663,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -681,17 +684,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer maxSize
     public void setMaxSize_Avg() {
         setMaxSize_Avg(null);
     }
 
-    public void setMaxSize_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setMaxSize_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setMaxSize_Avg("maxSize", opLambda);
     }
 
-    public void setMaxSize_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "maxSize");
+    public void setMaxSize_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -701,12 +703,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Max(null);
     }
 
-    public void setMaxSize_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setMaxSize_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setMaxSize_Max("maxSize", opLambda);
     }
 
-    public void setMaxSize_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "maxSize");
+    public void setMaxSize_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,12 +718,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Min(null);
     }
 
-    public void setMaxSize_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setMaxSize_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setMaxSize_Min("maxSize", opLambda);
     }
 
-    public void setMaxSize_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "maxSize");
+    public void setMaxSize_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,12 +733,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Sum(null);
     }
 
-    public void setMaxSize_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setMaxSize_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setMaxSize_Sum("maxSize", opLambda);
     }
 
-    public void setMaxSize_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "maxSize");
+    public void setMaxSize_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -746,12 +748,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_ExtendedStats(null);
     }
 
-    public void setMaxSize_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setMaxSize_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setMaxSize_ExtendedStats("maxSize", opLambda);
     }
 
-    public void setMaxSize_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "maxSize");
+    public void setMaxSize_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -761,12 +763,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Stats(null);
     }
 
-    public void setMaxSize_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setMaxSize_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setMaxSize_Stats("maxSize", opLambda);
     }
 
-    public void setMaxSize_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "maxSize");
+    public void setMaxSize_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -776,12 +778,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Percentiles(null);
     }
 
-    public void setMaxSize_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setMaxSize_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setMaxSize_Percentiles("maxSize", opLambda);
     }
 
-    public void setMaxSize_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "maxSize");
+    public void setMaxSize_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -791,12 +793,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_PercentileRanks(null);
     }
 
-    public void setMaxSize_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setMaxSize_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setMaxSize_PercentileRanks("maxSize", opLambda);
     }
 
-    public void setMaxSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "maxSize");
+    public void setMaxSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -806,16 +808,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Histogram(null);
     }
 
-    public void setMaxSize_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setMaxSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setMaxSize_Histogram("maxSize", opLambda, null);
     }
 
-    public void setMaxSize_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setMaxSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setMaxSize_Histogram("maxSize", opLambda, aggsLambda);
     }
 
-    public void setMaxSize_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "maxSize");
+    public void setMaxSize_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -830,16 +833,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Range(null);
     }
 
-    public void setMaxSize_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setMaxSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setMaxSize_Range("maxSize", opLambda, null);
     }
 
-    public void setMaxSize_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setMaxSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setMaxSize_Range("maxSize", opLambda, aggsLambda);
     }
 
-    public void setMaxSize_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "maxSize");
+    public void setMaxSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -854,12 +857,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Count(null);
     }
 
-    public void setMaxSize_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setMaxSize_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setMaxSize_Count("maxSize", opLambda);
     }
 
-    public void setMaxSize_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "maxSize");
+    public void setMaxSize_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -869,12 +872,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Cardinality(null);
     }
 
-    public void setMaxSize_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setMaxSize_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setMaxSize_Cardinality("maxSize", opLambda);
     }
 
-    public void setMaxSize_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "maxSize");
+    public void setMaxSize_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -884,16 +887,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setMaxSize_Missing(null);
     }
 
-    public void setMaxSize_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setMaxSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setMaxSize_Missing("maxSize", opLambda, null);
     }
 
-    public void setMaxSize_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setMaxSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setMaxSize_Missing("maxSize", opLambda, aggsLambda);
     }
 
-    public void setMaxSize_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "maxSize");
+    public void setMaxSize_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "maxSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,22 +908,20 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String query
-
     public void setQuery_Terms() {
         setQuery_Terms(null);
     }
 
-    public void setQuery_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setQuery_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setQuery_Terms("query", opLambda, null);
     }
 
-    public void setQuery_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setQuery_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setQuery_Terms("query", opLambda, aggsLambda);
     }
 
-    public void setQuery_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "query");
+    public void setQuery_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -934,17 +936,18 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setQuery_SignificantTerms(null);
     }
 
-    public void setQuery_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setQuery_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setQuery_SignificantTerms("query", opLambda, null);
     }
 
-    public void setQuery_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setQuery_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
         setQuery_SignificantTerms("query", opLambda, aggsLambda);
     }
 
-    public void setQuery_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setQuery_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsKeyMatchCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "query");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,16 +962,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setQuery_IpRange(null);
     }
 
-    public void setQuery_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setQuery_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setQuery_IpRange("query", opLambda, null);
     }
 
-    public void setQuery_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setQuery_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setQuery_IpRange("query", opLambda, aggsLambda);
     }
 
-    public void setQuery_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "query");
+    public void setQuery_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -983,12 +986,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setQuery_Count(null);
     }
 
-    public void setQuery_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQuery_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQuery_Count("query", opLambda);
     }
 
-    public void setQuery_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "query");
+    public void setQuery_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -998,12 +1001,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setQuery_Cardinality(null);
     }
 
-    public void setQuery_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQuery_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQuery_Cardinality("query", opLambda);
     }
 
-    public void setQuery_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "query");
+    public void setQuery_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1013,16 +1016,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setQuery_Missing(null);
     }
 
-    public void setQuery_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQuery_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQuery_Missing("query", opLambda, null);
     }
 
-    public void setQuery_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setQuery_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setQuery_Missing("query", opLambda, aggsLambda);
     }
 
-    public void setQuery_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "query");
+    public void setQuery_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "query");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1033,22 +1036,20 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String term
-
     public void setTerm_Terms() {
         setTerm_Terms(null);
     }
 
-    public void setTerm_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTerm_Terms("term", opLambda, null);
     }
 
-    public void setTerm_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setTerm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setTerm_Terms("term", opLambda, aggsLambda);
     }
 
-    public void setTerm_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "term");
+    public void setTerm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1063,17 +1064,18 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setTerm_SignificantTerms(null);
     }
 
-    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTerm_SignificantTerms("term", opLambda, null);
     }
 
-    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setTerm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
         setTerm_SignificantTerms("term", opLambda, aggsLambda);
     }
 
-    public void setTerm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTerm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsKeyMatchCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "term");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,16 +1090,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setTerm_IpRange(null);
     }
 
-    public void setTerm_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTerm_IpRange("term", opLambda, null);
     }
 
-    public void setTerm_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setTerm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setTerm_IpRange("term", opLambda, aggsLambda);
     }
 
-    public void setTerm_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "term");
+    public void setTerm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,12 +1114,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setTerm_Count(null);
     }
 
-    public void setTerm_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTerm_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTerm_Count("term", opLambda);
     }
 
-    public void setTerm_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "term");
+    public void setTerm_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1127,12 +1129,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setTerm_Cardinality(null);
     }
 
-    public void setTerm_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTerm_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTerm_Cardinality("term", opLambda);
     }
 
-    public void setTerm_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "term");
+    public void setTerm_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1142,16 +1144,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setTerm_Missing(null);
     }
 
-    public void setTerm_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTerm_Missing("term", opLambda, null);
     }
 
-    public void setTerm_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setTerm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setTerm_Missing("term", opLambda, aggsLambda);
     }
 
-    public void setTerm_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "term");
+    public void setTerm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "term");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1162,22 +1164,20 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1192,17 +1192,18 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsKeyMatchCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1217,16 +1218,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,12 +1243,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1256,12 +1258,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1271,16 +1273,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1291,17 +1294,16 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1311,12 +1313,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1326,12 +1328,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1341,12 +1343,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1356,12 +1358,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1371,12 +1373,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1386,12 +1388,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1401,12 +1403,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1416,16 +1418,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1440,16 +1443,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1464,12 +1468,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1479,12 +1483,12 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1494,16 +1498,17 @@ public abstract class BsKeyMatchCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsKeyMatchCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsKeyMatchCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelToRoleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelToRoleCA.java
index 32b966bf16f04cf205af25ba0b10b5be43e351a9..cc6d1c4f621b64e01308860d85a14f983b9e6214 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelToRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelToRoleCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.LabelToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,16 +151,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -176,12 +176,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -191,12 +191,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -206,16 +206,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -226,22 +227,21 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,18 +256,18 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -282,16 +282,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,12 +307,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -321,12 +322,12 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -336,16 +337,17 @@ public abstract class BsLabelToRoleCA extends EsAbstractConditionAggregation {
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelToRoleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
index fe411d0dc95e65ba63e023ca965e049641d51e9f..222c5d38193f69a4979f1217fb1e4f30163b5ed7 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsLabelTypeCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.LabelTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.LabelTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsLabelTypeCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +135,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +161,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +186,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +201,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +216,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,17 +237,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +256,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +271,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,12 +286,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -300,12 +301,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -315,12 +316,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,12 +331,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -345,12 +346,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -360,16 +361,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +386,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +411,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +426,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +441,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,22 +462,21 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String excludedPaths
-
     public void setExcludedPaths_Terms() {
         setExcludedPaths_Terms(null);
     }
 
-    public void setExcludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setExcludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setExcludedPaths_Terms("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setExcludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setExcludedPaths_Terms("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "excludedPaths");
+    public void setExcludedPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,18 +491,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setExcludedPaths_SignificantTerms(null);
     }
 
-    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setExcludedPaths_SignificantTerms("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
         setExcludedPaths_SignificantTerms("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "excludedPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -514,16 +517,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setExcludedPaths_IpRange(null);
     }
 
-    public void setExcludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setExcludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setExcludedPaths_IpRange("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setExcludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setExcludedPaths_IpRange("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "excludedPaths");
+    public void setExcludedPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -538,12 +542,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Count(null);
     }
 
-    public void setExcludedPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExcludedPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExcludedPaths_Count("excludedPaths", opLambda);
     }
 
-    public void setExcludedPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "excludedPaths");
+    public void setExcludedPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -553,12 +557,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Cardinality(null);
     }
 
-    public void setExcludedPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExcludedPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExcludedPaths_Cardinality("excludedPaths", opLambda);
     }
 
-    public void setExcludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "excludedPaths");
+    public void setExcludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -568,16 +572,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setExcludedPaths_Missing(null);
     }
 
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExcludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExcludedPaths_Missing("excludedPaths", opLambda, null);
     }
 
-    public void setExcludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setExcludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setExcludedPaths_Missing("excludedPaths", opLambda, aggsLambda);
     }
 
-    public void setExcludedPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "excludedPaths");
+    public void setExcludedPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "excludedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -588,22 +593,21 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String includedPaths
-
     public void setIncludedPaths_Terms() {
         setIncludedPaths_Terms(null);
     }
 
-    public void setIncludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setIncludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setIncludedPaths_Terms("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setIncludedPaths_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setIncludedPaths_Terms("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "includedPaths");
+    public void setIncludedPaths_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -618,18 +622,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setIncludedPaths_SignificantTerms(null);
     }
 
-    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setIncludedPaths_SignificantTerms("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedPaths_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
         setIncludedPaths_SignificantTerms("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedPaths_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "includedPaths");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -644,16 +648,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setIncludedPaths_IpRange(null);
     }
 
-    public void setIncludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setIncludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setIncludedPaths_IpRange("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setIncludedPaths_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setIncludedPaths_IpRange("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "includedPaths");
+    public void setIncludedPaths_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -668,12 +673,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Count(null);
     }
 
-    public void setIncludedPaths_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIncludedPaths_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIncludedPaths_Count("includedPaths", opLambda);
     }
 
-    public void setIncludedPaths_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "includedPaths");
+    public void setIncludedPaths_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,12 +688,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Cardinality(null);
     }
 
-    public void setIncludedPaths_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIncludedPaths_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIncludedPaths_Cardinality("includedPaths", opLambda);
     }
 
-    public void setIncludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "includedPaths");
+    public void setIncludedPaths_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,16 +703,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setIncludedPaths_Missing(null);
     }
 
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIncludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIncludedPaths_Missing("includedPaths", opLambda, null);
     }
 
-    public void setIncludedPaths_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setIncludedPaths_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setIncludedPaths_Missing("includedPaths", opLambda, aggsLambda);
     }
 
-    public void setIncludedPaths_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "includedPaths");
+    public void setIncludedPaths_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "includedPaths");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -718,22 +724,20 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -748,17 +752,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -773,16 +778,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -797,12 +802,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -812,12 +817,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,16 +832,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -847,22 +852,21 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -877,18 +881,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -903,16 +907,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,12 +932,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -942,12 +947,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -957,16 +962,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -977,17 +983,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -997,12 +1002,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1012,12 +1017,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1027,12 +1032,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1042,12 +1047,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,12 +1062,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1072,12 +1077,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1087,12 +1092,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,16 +1107,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1126,16 +1132,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1150,12 +1157,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1165,12 +1172,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1180,16 +1187,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1200,22 +1208,21 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,17 +1237,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1255,16 +1263,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1279,12 +1288,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1294,12 +1303,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1309,16 +1318,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1329,17 +1339,16 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1349,12 +1358,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1364,12 +1373,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1379,12 +1388,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1394,12 +1403,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1409,12 +1418,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1424,12 +1433,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1439,12 +1448,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1454,16 +1463,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1478,16 +1488,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1502,12 +1513,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1517,12 +1528,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1532,16 +1543,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1552,22 +1564,20 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1582,17 +1592,18 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsLabelTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1607,16 +1618,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1631,12 +1643,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1646,12 +1658,12 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1661,16 +1673,17 @@ public abstract class BsLabelTypeCA extends EsAbstractConditionAggregation {
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsLabelTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsLabelTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
index 6c5633e0a977c421d709bdc91edd11096d29ac09..dc5a294716e758271fa2f930e780561c3a144f94 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsPathMappingCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.PathMappingCA;
 import org.codelibs.fess.es.config.cbean.cq.PathMappingCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsPathMappingCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,16 +161,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +186,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +201,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,16 +216,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -236,17 +237,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,12 +256,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,12 +271,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -286,12 +286,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -301,12 +301,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,12 +316,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -331,12 +331,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -346,12 +346,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -361,17 +361,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -386,16 +386,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +411,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +426,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,16 +441,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -460,22 +462,21 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String processType
-
     public void setProcessType_Terms() {
         setProcessType_Terms(null);
     }
 
-    public void setProcessType_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setProcessType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setProcessType_Terms("processType", opLambda, null);
     }
 
-    public void setProcessType_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setProcessType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setProcessType_Terms("processType", opLambda, aggsLambda);
     }
 
-    public void setProcessType_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "processType");
+    public void setProcessType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,18 +491,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setProcessType_SignificantTerms(null);
     }
 
-    public void setProcessType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setProcessType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setProcessType_SignificantTerms("processType", opLambda, null);
     }
 
-    public void setProcessType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProcessType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
         setProcessType_SignificantTerms("processType", opLambda, aggsLambda);
     }
 
-    public void setProcessType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProcessType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "processType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -516,16 +517,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setProcessType_IpRange(null);
     }
 
-    public void setProcessType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setProcessType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setProcessType_IpRange("processType", opLambda, null);
     }
 
-    public void setProcessType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setProcessType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setProcessType_IpRange("processType", opLambda, aggsLambda);
     }
 
-    public void setProcessType_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "processType");
+    public void setProcessType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -540,12 +542,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setProcessType_Count(null);
     }
 
-    public void setProcessType_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setProcessType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setProcessType_Count("processType", opLambda);
     }
 
-    public void setProcessType_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "processType");
+    public void setProcessType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -555,12 +557,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setProcessType_Cardinality(null);
     }
 
-    public void setProcessType_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setProcessType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setProcessType_Cardinality("processType", opLambda);
     }
 
-    public void setProcessType_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "processType");
+    public void setProcessType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -570,16 +572,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setProcessType_Missing(null);
     }
 
-    public void setProcessType_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setProcessType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setProcessType_Missing("processType", opLambda, null);
     }
 
-    public void setProcessType_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setProcessType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setProcessType_Missing("processType", opLambda, aggsLambda);
     }
 
-    public void setProcessType_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "processType");
+    public void setProcessType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "processType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -590,22 +593,20 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String regex
-
     public void setRegex_Terms() {
         setRegex_Terms(null);
     }
 
-    public void setRegex_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRegex_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRegex_Terms("regex", opLambda, null);
     }
 
-    public void setRegex_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setRegex_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setRegex_Terms("regex", opLambda, aggsLambda);
     }
 
-    public void setRegex_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "regex");
+    public void setRegex_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,17 +621,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setRegex_SignificantTerms(null);
     }
 
-    public void setRegex_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRegex_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRegex_SignificantTerms("regex", opLambda, null);
     }
 
-    public void setRegex_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setRegex_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
         setRegex_SignificantTerms("regex", opLambda, aggsLambda);
     }
 
-    public void setRegex_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRegex_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "regex");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -645,16 +647,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setRegex_IpRange(null);
     }
 
-    public void setRegex_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRegex_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRegex_IpRange("regex", opLambda, null);
     }
 
-    public void setRegex_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setRegex_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setRegex_IpRange("regex", opLambda, aggsLambda);
     }
 
-    public void setRegex_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "regex");
+    public void setRegex_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -669,12 +672,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setRegex_Count(null);
     }
 
-    public void setRegex_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRegex_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRegex_Count("regex", opLambda);
     }
 
-    public void setRegex_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "regex");
+    public void setRegex_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -684,12 +687,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setRegex_Cardinality(null);
     }
 
-    public void setRegex_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRegex_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRegex_Cardinality("regex", opLambda);
     }
 
-    public void setRegex_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "regex");
+    public void setRegex_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -699,16 +702,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setRegex_Missing(null);
     }
 
-    public void setRegex_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRegex_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRegex_Missing("regex", opLambda, null);
     }
 
-    public void setRegex_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setRegex_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setRegex_Missing("regex", opLambda, aggsLambda);
     }
 
-    public void setRegex_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "regex");
+    public void setRegex_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "regex");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,22 +723,21 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String replacement
-
     public void setReplacement_Terms() {
         setReplacement_Terms(null);
     }
 
-    public void setReplacement_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setReplacement_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setReplacement_Terms("replacement", opLambda, null);
     }
 
-    public void setReplacement_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setReplacement_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setReplacement_Terms("replacement", opLambda, aggsLambda);
     }
 
-    public void setReplacement_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "replacement");
+    public void setReplacement_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -749,18 +752,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setReplacement_SignificantTerms(null);
     }
 
-    public void setReplacement_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setReplacement_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setReplacement_SignificantTerms("replacement", opLambda, null);
     }
 
-    public void setReplacement_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setReplacement_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
         setReplacement_SignificantTerms("replacement", opLambda, aggsLambda);
     }
 
-    public void setReplacement_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setReplacement_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "replacement");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -775,16 +778,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setReplacement_IpRange(null);
     }
 
-    public void setReplacement_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setReplacement_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setReplacement_IpRange("replacement", opLambda, null);
     }
 
-    public void setReplacement_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setReplacement_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setReplacement_IpRange("replacement", opLambda, aggsLambda);
     }
 
-    public void setReplacement_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "replacement");
+    public void setReplacement_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -799,12 +803,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setReplacement_Count(null);
     }
 
-    public void setReplacement_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setReplacement_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setReplacement_Count("replacement", opLambda);
     }
 
-    public void setReplacement_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "replacement");
+    public void setReplacement_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -814,12 +818,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setReplacement_Cardinality(null);
     }
 
-    public void setReplacement_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setReplacement_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setReplacement_Cardinality("replacement", opLambda);
     }
 
-    public void setReplacement_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "replacement");
+    public void setReplacement_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -829,16 +833,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setReplacement_Missing(null);
     }
 
-    public void setReplacement_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setReplacement_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setReplacement_Missing("replacement", opLambda, null);
     }
 
-    public void setReplacement_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setReplacement_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setReplacement_Missing("replacement", opLambda, aggsLambda);
     }
 
-    public void setReplacement_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "replacement");
+    public void setReplacement_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "replacement");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,17 +854,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -869,12 +873,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -884,12 +888,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -899,12 +903,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -914,12 +918,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -929,12 +933,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -944,12 +948,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,12 +963,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -974,16 +978,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -998,16 +1003,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,12 +1028,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1037,12 +1043,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1052,16 +1058,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1072,22 +1079,21 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userAgent
-
     public void setUserAgent_Terms() {
         setUserAgent_Terms(null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserAgent_Terms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUserAgent_Terms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userAgent");
+    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,18 +1108,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUserAgent_SignificantTerms(null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userAgent");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1128,16 +1134,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUserAgent_IpRange(null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserAgent_IpRange("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUserAgent_IpRange("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userAgent");
+    public void setUserAgent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1152,12 +1159,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUserAgent_Count(null);
     }
 
-    public void setUserAgent_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserAgent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserAgent_Count("userAgent", opLambda);
     }
 
-    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userAgent");
+    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1167,12 +1174,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUserAgent_Cardinality(null);
     }
 
-    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserAgent_Cardinality("userAgent", opLambda);
     }
 
-    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userAgent");
+    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1182,16 +1189,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUserAgent_Missing(null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserAgent_Missing("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUserAgent_Missing("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userAgent");
+    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1202,22 +1210,21 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1232,18 +1239,18 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1258,16 +1265,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1282,12 +1290,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,12 +1305,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1312,16 +1320,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1332,17 +1341,16 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1352,12 +1360,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1367,12 +1375,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1382,12 +1390,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1397,12 +1405,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1412,12 +1420,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1427,12 +1435,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1442,12 +1450,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1457,17 +1465,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsPathMappingCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,16 +1490,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1506,12 +1515,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1521,12 +1530,12 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1536,16 +1545,17 @@ public abstract class BsPathMappingCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsPathMappingCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsPathMappingCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
index 57535a338d46994b0989a47ec51f6c5bd9ac21a8..3b5c0a7e76991e7bf564bf1f6bc130fa3a001903 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRequestHeaderCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.RequestHeaderCA;
 import org.codelibs.fess.es.config.cbean.cq.RequestHeaderCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRequestHeaderCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,16 +161,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +186,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +201,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,16 +216,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -236,17 +237,16 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,12 +256,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,12 +271,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -286,12 +286,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -301,12 +301,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,12 +316,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -331,12 +331,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -346,12 +346,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -361,17 +361,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -386,16 +387,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +412,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +427,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,16 +442,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -460,22 +463,20 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,17 +491,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -515,16 +517,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -539,12 +542,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -554,12 +557,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -569,16 +572,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -589,22 +593,21 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -619,18 +622,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -645,16 +648,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -669,12 +673,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -684,12 +688,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -699,16 +703,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,17 +724,16 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -739,12 +743,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -754,12 +758,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -769,12 +773,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -784,12 +788,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -799,12 +803,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -814,12 +818,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -829,12 +833,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -844,17 +848,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -869,16 +874,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,12 +899,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -908,12 +914,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -923,16 +929,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -943,22 +950,21 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -973,17 +979,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -998,16 +1005,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,12 +1030,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1037,12 +1045,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1052,16 +1060,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1072,22 +1081,21 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String webConfigId
-
     public void setWebConfigId_Terms() {
         setWebConfigId_Terms(null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "webConfigId");
+    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,18 +1110,18 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setWebConfigId_SignificantTerms(null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "webConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1128,17 +1136,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setWebConfigId_IpRange(null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "webConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1153,12 +1161,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setWebConfigId_Count(null);
     }
 
-    public void setWebConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setWebConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setWebConfigId_Count("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "webConfigId");
+    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1168,12 +1176,12 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setWebConfigId_Cardinality(null);
     }
 
-    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setWebConfigId_Cardinality("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "webConfigId");
+    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1183,16 +1191,17 @@ public abstract class BsRequestHeaderCA extends EsAbstractConditionAggregation {
         setWebConfigId_Missing(null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRequestHeaderCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "webConfigId");
+    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRequestHeaderCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
index 38214932091f40bfa77ec81e792b6752c2ca8d3d..6ba90a66a2155a267523552ea6aa5c7231c5cabd 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsRoleTypeCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.RoleTypeCA;
 import org.codelibs.fess.es.config.cbean.cq.RoleTypeCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsRoleTypeCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,34 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +134,18 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRoleTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +160,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +185,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +200,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +215,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,17 +236,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +255,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +270,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,12 +285,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -300,12 +300,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -315,12 +315,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,12 +330,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -345,12 +345,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -360,16 +360,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +385,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +410,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +425,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +440,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,22 +461,20 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -488,17 +489,18 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRoleTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,16 +515,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -537,12 +539,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,12 +554,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -567,16 +569,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,17 +589,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -607,12 +608,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -622,12 +623,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -637,12 +638,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,12 +653,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -667,12 +668,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -682,12 +683,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -697,12 +698,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -712,16 +713,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -736,16 +738,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -760,12 +762,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -775,12 +777,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -790,16 +792,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -810,22 +813,20 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -840,17 +841,18 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRoleTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -865,16 +867,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -889,12 +892,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,12 +907,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -919,16 +922,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,17 +943,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,12 +962,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -974,12 +977,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -989,12 +992,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1004,12 +1007,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1019,12 +1022,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1034,12 +1037,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1049,12 +1052,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1064,16 +1067,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,16 +1092,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,12 +1117,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1127,12 +1132,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1142,16 +1147,17 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1162,22 +1168,20 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1192,17 +1196,18 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsRoleTypeCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRoleTypeCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1217,16 +1222,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,12 +1246,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1256,12 +1261,12 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1271,16 +1276,16 @@ public abstract class BsRoleTypeCA extends EsAbstractConditionAggregation {
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleTypeCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
index 64226a8c819890f92f97ad7f5eca00454d58e36b..be8259c49c58da4da476270e84ecba7d1303082b 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsScheduledJobCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.ScheduledJobCA;
 import org.codelibs.fess.es.config.cbean.cq.ScheduledJobCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsScheduledJobCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Boolean available
     public void setAvailable_Avg() {
         setAvailable_Avg(null);
     }
 
-    public void setAvailable_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setAvailable_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setAvailable_Avg("available", opLambda);
     }
 
-    public void setAvailable_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "available");
+    public void setAvailable_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Max(null);
     }
 
-    public void setAvailable_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setAvailable_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setAvailable_Max("available", opLambda);
     }
 
-    public void setAvailable_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "available");
+    public void setAvailable_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Min(null);
     }
 
-    public void setAvailable_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setAvailable_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setAvailable_Min("available", opLambda);
     }
 
-    public void setAvailable_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "available");
+    public void setAvailable_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Sum(null);
     }
 
-    public void setAvailable_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setAvailable_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setAvailable_Sum("available", opLambda);
     }
 
-    public void setAvailable_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "available");
+    public void setAvailable_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_ExtendedStats(null);
     }
 
-    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setAvailable_ExtendedStats("available", opLambda);
     }
 
-    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "available");
+    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Stats(null);
     }
 
-    public void setAvailable_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setAvailable_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setAvailable_Stats("available", opLambda);
     }
 
-    public void setAvailable_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "available");
+    public void setAvailable_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Percentiles(null);
     }
 
-    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setAvailable_Percentiles("available", opLambda);
     }
 
-    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "available");
+    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_PercentileRanks(null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setAvailable_PercentileRanks("available", opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,17 +230,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Histogram(null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setAvailable_Histogram("available", opLambda, null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setAvailable_Histogram("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "available");
+        HistogramAggregationBuilder builder = regHistogramA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -256,16 +255,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Range(null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setAvailable_Range("available", opLambda, null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setAvailable_Range("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "available");
+    public void setAvailable_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -280,12 +280,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Count(null);
     }
 
-    public void setAvailable_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAvailable_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAvailable_Count("available", opLambda);
     }
 
-    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "available");
+    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,12 +295,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Cardinality(null);
     }
 
-    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAvailable_Cardinality("available", opLambda);
     }
 
-    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "available");
+    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -310,16 +310,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setAvailable_Missing(null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAvailable_Missing("available", opLambda, null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setAvailable_Missing("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "available");
+    public void setAvailable_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,17 +331,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Boolean crawler
     public void setCrawler_Avg() {
         setCrawler_Avg(null);
     }
 
-    public void setCrawler_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCrawler_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCrawler_Avg("crawler", opLambda);
     }
 
-    public void setCrawler_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "crawler");
+    public void setCrawler_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,12 +350,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Max(null);
     }
 
-    public void setCrawler_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCrawler_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCrawler_Max("crawler", opLambda);
     }
 
-    public void setCrawler_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "crawler");
+    public void setCrawler_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -365,12 +365,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Min(null);
     }
 
-    public void setCrawler_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCrawler_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCrawler_Min("crawler", opLambda);
     }
 
-    public void setCrawler_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "crawler");
+    public void setCrawler_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -380,12 +380,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Sum(null);
     }
 
-    public void setCrawler_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCrawler_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCrawler_Sum("crawler", opLambda);
     }
 
-    public void setCrawler_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "crawler");
+    public void setCrawler_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -395,12 +395,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_ExtendedStats(null);
     }
 
-    public void setCrawler_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCrawler_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCrawler_ExtendedStats("crawler", opLambda);
     }
 
-    public void setCrawler_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "crawler");
+    public void setCrawler_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -410,12 +410,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Stats(null);
     }
 
-    public void setCrawler_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCrawler_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCrawler_Stats("crawler", opLambda);
     }
 
-    public void setCrawler_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "crawler");
+    public void setCrawler_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -425,12 +425,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Percentiles(null);
     }
 
-    public void setCrawler_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCrawler_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCrawler_Percentiles("crawler", opLambda);
     }
 
-    public void setCrawler_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "crawler");
+    public void setCrawler_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -440,12 +440,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_PercentileRanks(null);
     }
 
-    public void setCrawler_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCrawler_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCrawler_PercentileRanks("crawler", opLambda);
     }
 
-    public void setCrawler_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "crawler");
+    public void setCrawler_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -455,16 +455,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Histogram(null);
     }
 
-    public void setCrawler_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCrawler_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCrawler_Histogram("crawler", opLambda, null);
     }
 
-    public void setCrawler_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCrawler_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCrawler_Histogram("crawler", opLambda, aggsLambda);
     }
 
-    public void setCrawler_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "crawler");
+    public void setCrawler_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,16 +480,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Range(null);
     }
 
-    public void setCrawler_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCrawler_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCrawler_Range("crawler", opLambda, null);
     }
 
-    public void setCrawler_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCrawler_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCrawler_Range("crawler", opLambda, aggsLambda);
     }
 
-    public void setCrawler_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "crawler");
+    public void setCrawler_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -503,12 +505,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Count(null);
     }
 
-    public void setCrawler_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCrawler_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCrawler_Count("crawler", opLambda);
     }
 
-    public void setCrawler_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "crawler");
+    public void setCrawler_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -518,12 +520,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Cardinality(null);
     }
 
-    public void setCrawler_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCrawler_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCrawler_Cardinality("crawler", opLambda);
     }
 
-    public void setCrawler_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "crawler");
+    public void setCrawler_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -533,16 +535,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCrawler_Missing(null);
     }
 
-    public void setCrawler_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCrawler_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCrawler_Missing("crawler", opLambda, null);
     }
 
-    public void setCrawler_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCrawler_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCrawler_Missing("crawler", opLambda, aggsLambda);
     }
 
-    public void setCrawler_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "crawler");
+    public void setCrawler_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "crawler");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -553,22 +556,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -583,18 +585,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,16 +611,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +636,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +651,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,16 +666,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,17 +687,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -703,12 +706,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -718,12 +721,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -733,12 +736,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -748,12 +751,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,12 +766,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,12 +781,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -793,12 +796,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -808,17 +811,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -833,16 +837,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -857,12 +862,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -872,12 +877,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -887,16 +892,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,22 +913,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String cronExpression
-
     public void setCronExpression_Terms() {
         setCronExpression_Terms(null);
     }
 
-    public void setCronExpression_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCronExpression_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCronExpression_Terms("cronExpression", opLambda, null);
     }
 
-    public void setCronExpression_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCronExpression_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCronExpression_Terms("cronExpression", opLambda, aggsLambda);
     }
 
-    public void setCronExpression_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "cronExpression");
+    public void setCronExpression_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -937,18 +942,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCronExpression_SignificantTerms(null);
     }
 
-    public void setCronExpression_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCronExpression_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCronExpression_SignificantTerms("cronExpression", opLambda, null);
     }
 
-    public void setCronExpression_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCronExpression_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCronExpression_SignificantTerms("cronExpression", opLambda, aggsLambda);
     }
 
-    public void setCronExpression_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCronExpression_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "cronExpression");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -963,17 +968,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCronExpression_IpRange(null);
     }
 
-    public void setCronExpression_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCronExpression_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCronExpression_IpRange("cronExpression", opLambda, null);
     }
 
-    public void setCronExpression_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCronExpression_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCronExpression_IpRange("cronExpression", opLambda, aggsLambda);
     }
 
-    public void setCronExpression_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCronExpression_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "cronExpression");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -988,12 +993,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCronExpression_Count(null);
     }
 
-    public void setCronExpression_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCronExpression_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCronExpression_Count("cronExpression", opLambda);
     }
 
-    public void setCronExpression_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "cronExpression");
+    public void setCronExpression_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1003,12 +1008,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCronExpression_Cardinality(null);
     }
 
-    public void setCronExpression_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCronExpression_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCronExpression_Cardinality("cronExpression", opLambda);
     }
 
-    public void setCronExpression_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "cronExpression");
+    public void setCronExpression_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1018,17 +1023,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setCronExpression_Missing(null);
     }
 
-    public void setCronExpression_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCronExpression_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCronExpression_Missing("cronExpression", opLambda, null);
     }
 
-    public void setCronExpression_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setCronExpression_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setCronExpression_Missing("cronExpression", opLambda, aggsLambda);
     }
 
-    public void setCronExpression_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCronExpression_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "cronExpression");
+        MissingAggregationBuilder builder = regMissingA(name, "cronExpression");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1039,17 +1044,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Boolean jobLogging
     public void setJobLogging_Avg() {
         setJobLogging_Avg(null);
     }
 
-    public void setJobLogging_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setJobLogging_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setJobLogging_Avg("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "jobLogging");
+    public void setJobLogging_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1059,12 +1063,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Max(null);
     }
 
-    public void setJobLogging_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setJobLogging_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setJobLogging_Max("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "jobLogging");
+    public void setJobLogging_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1074,12 +1078,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Min(null);
     }
 
-    public void setJobLogging_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setJobLogging_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setJobLogging_Min("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "jobLogging");
+    public void setJobLogging_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,12 +1093,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Sum(null);
     }
 
-    public void setJobLogging_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setJobLogging_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setJobLogging_Sum("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "jobLogging");
+    public void setJobLogging_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1104,12 +1108,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_ExtendedStats(null);
     }
 
-    public void setJobLogging_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setJobLogging_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setJobLogging_ExtendedStats("jobLogging", opLambda);
     }
 
-    public void setJobLogging_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "jobLogging");
+    public void setJobLogging_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1119,12 +1123,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Stats(null);
     }
 
-    public void setJobLogging_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setJobLogging_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setJobLogging_Stats("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "jobLogging");
+    public void setJobLogging_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,12 +1138,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Percentiles(null);
     }
 
-    public void setJobLogging_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setJobLogging_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setJobLogging_Percentiles("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "jobLogging");
+    public void setJobLogging_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1149,12 +1153,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_PercentileRanks(null);
     }
 
-    public void setJobLogging_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setJobLogging_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setJobLogging_PercentileRanks("jobLogging", opLambda);
     }
 
-    public void setJobLogging_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "jobLogging");
+    public void setJobLogging_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1164,17 +1168,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Histogram(null);
     }
 
-    public void setJobLogging_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setJobLogging_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setJobLogging_Histogram("jobLogging", opLambda, null);
     }
 
-    public void setJobLogging_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setJobLogging_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setJobLogging_Histogram("jobLogging", opLambda, aggsLambda);
     }
 
-    public void setJobLogging_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setJobLogging_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "jobLogging");
+        HistogramAggregationBuilder builder = regHistogramA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1189,16 +1193,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Range(null);
     }
 
-    public void setJobLogging_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setJobLogging_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setJobLogging_Range("jobLogging", opLambda, null);
     }
 
-    public void setJobLogging_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setJobLogging_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setJobLogging_Range("jobLogging", opLambda, aggsLambda);
     }
 
-    public void setJobLogging_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "jobLogging");
+    public void setJobLogging_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1213,12 +1218,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Count(null);
     }
 
-    public void setJobLogging_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setJobLogging_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setJobLogging_Count("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "jobLogging");
+    public void setJobLogging_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1228,12 +1233,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Cardinality(null);
     }
 
-    public void setJobLogging_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setJobLogging_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setJobLogging_Cardinality("jobLogging", opLambda);
     }
 
-    public void setJobLogging_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "jobLogging");
+    public void setJobLogging_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1243,16 +1248,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setJobLogging_Missing(null);
     }
 
-    public void setJobLogging_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setJobLogging_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setJobLogging_Missing("jobLogging", opLambda, null);
     }
 
-    public void setJobLogging_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setJobLogging_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setJobLogging_Missing("jobLogging", opLambda, aggsLambda);
     }
 
-    public void setJobLogging_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "jobLogging");
+    public void setJobLogging_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "jobLogging");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,22 +1269,20 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1293,17 +1297,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1318,16 +1323,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1342,12 +1348,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1357,12 +1363,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1372,16 +1378,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1392,22 +1399,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String scriptData
-
     public void setScriptData_Terms() {
         setScriptData_Terms(null);
     }
 
-    public void setScriptData_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setScriptData_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setScriptData_Terms("scriptData", opLambda, null);
     }
 
-    public void setScriptData_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptData_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptData_Terms("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "scriptData");
+    public void setScriptData_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1422,18 +1428,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptData_SignificantTerms(null);
     }
 
-    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setScriptData_SignificantTerms("scriptData", opLambda, null);
     }
 
-    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptData_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptData_SignificantTerms("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptData_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "scriptData");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,16 +1454,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptData_IpRange(null);
     }
 
-    public void setScriptData_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setScriptData_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setScriptData_IpRange("scriptData", opLambda, null);
     }
 
-    public void setScriptData_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptData_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptData_IpRange("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "scriptData");
+    public void setScriptData_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1472,12 +1479,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptData_Count(null);
     }
 
-    public void setScriptData_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setScriptData_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setScriptData_Count("scriptData", opLambda);
     }
 
-    public void setScriptData_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "scriptData");
+    public void setScriptData_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1487,12 +1494,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptData_Cardinality(null);
     }
 
-    public void setScriptData_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setScriptData_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setScriptData_Cardinality("scriptData", opLambda);
     }
 
-    public void setScriptData_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "scriptData");
+    public void setScriptData_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1502,16 +1509,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptData_Missing(null);
     }
 
-    public void setScriptData_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setScriptData_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setScriptData_Missing("scriptData", opLambda, null);
     }
 
-    public void setScriptData_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptData_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptData_Missing("scriptData", opLambda, aggsLambda);
     }
 
-    public void setScriptData_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "scriptData");
+    public void setScriptData_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "scriptData");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1522,22 +1530,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String scriptType
-
     public void setScriptType_Terms() {
         setScriptType_Terms(null);
     }
 
-    public void setScriptType_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setScriptType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setScriptType_Terms("scriptType", opLambda, null);
     }
 
-    public void setScriptType_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptType_Terms("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "scriptType");
+    public void setScriptType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1552,18 +1559,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptType_SignificantTerms(null);
     }
 
-    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setScriptType_SignificantTerms("scriptType", opLambda, null);
     }
 
-    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptType_SignificantTerms("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setScriptType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "scriptType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1578,16 +1585,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptType_IpRange(null);
     }
 
-    public void setScriptType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setScriptType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setScriptType_IpRange("scriptType", opLambda, null);
     }
 
-    public void setScriptType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptType_IpRange("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "scriptType");
+    public void setScriptType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1602,12 +1610,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptType_Count(null);
     }
 
-    public void setScriptType_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setScriptType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setScriptType_Count("scriptType", opLambda);
     }
 
-    public void setScriptType_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "scriptType");
+    public void setScriptType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1617,12 +1625,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptType_Cardinality(null);
     }
 
-    public void setScriptType_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setScriptType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setScriptType_Cardinality("scriptType", opLambda);
     }
 
-    public void setScriptType_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "scriptType");
+    public void setScriptType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1632,16 +1640,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setScriptType_Missing(null);
     }
 
-    public void setScriptType_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setScriptType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setScriptType_Missing("scriptType", opLambda, null);
     }
 
-    public void setScriptType_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setScriptType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setScriptType_Missing("scriptType", opLambda, aggsLambda);
     }
 
-    public void setScriptType_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "scriptType");
+    public void setScriptType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "scriptType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1652,17 +1661,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1672,12 +1680,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1687,12 +1695,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1702,12 +1710,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1717,12 +1725,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1732,12 +1740,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1747,12 +1755,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1762,12 +1770,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1777,17 +1785,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1802,16 +1810,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1826,12 +1835,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1841,12 +1850,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1856,16 +1865,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1876,22 +1886,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String target
-
     public void setTarget_Terms() {
         setTarget_Terms(null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTarget_Terms("target", opLambda, null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setTarget_Terms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "target");
+    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1906,17 +1915,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setTarget_SignificantTerms(null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTarget_SignificantTerms("target", opLambda, null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
         setTarget_SignificantTerms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "target");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1931,16 +1941,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setTarget_IpRange(null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTarget_IpRange("target", opLambda, null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setTarget_IpRange("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "target");
+    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1955,12 +1966,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setTarget_Count(null);
     }
 
-    public void setTarget_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTarget_Count("target", opLambda);
     }
 
-    public void setTarget_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "target");
+    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1970,12 +1981,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setTarget_Cardinality(null);
     }
 
-    public void setTarget_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTarget_Cardinality("target", opLambda);
     }
 
-    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "target");
+    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1985,16 +1996,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setTarget_Missing(null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTarget_Missing("target", opLambda, null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setTarget_Missing("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "target");
+    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2005,22 +2017,21 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2035,18 +2046,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2061,16 +2072,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2085,12 +2097,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2100,12 +2112,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2115,16 +2127,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2135,17 +2148,16 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2155,12 +2167,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2170,12 +2182,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2185,12 +2197,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2200,12 +2212,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2215,12 +2227,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2230,12 +2242,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2245,12 +2257,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2260,17 +2272,18 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsScheduledJobCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2285,16 +2298,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2309,12 +2323,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2324,12 +2338,12 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2339,16 +2353,17 @@ public abstract class BsScheduledJobCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsScheduledJobCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsScheduledJobCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
index f000d07262bb8bebbfc758a239dd49d75bc5aa8c..cf0646091de90478f1d1d90385100a3eeb38c61d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsThumbnailQueueCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.ThumbnailQueueCA;
 import org.codelibs.fess.es.config.cbean.cq.ThumbnailQueueCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsThumbnailQueueCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,17 +161,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -187,12 +186,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -202,12 +201,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -217,16 +216,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -237,17 +237,16 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -257,12 +256,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,12 +271,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -287,12 +286,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -302,12 +301,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,12 +316,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -332,12 +331,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -347,12 +346,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -362,17 +361,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -387,16 +387,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -411,12 +412,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -426,12 +427,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -441,17 +442,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -462,22 +463,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String target
-
     public void setTarget_Terms() {
         setTarget_Terms(null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTarget_Terms("target", opLambda, null);
     }
 
-    public void setTarget_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_Terms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "target");
+    public void setTarget_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -492,18 +492,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_SignificantTerms(null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTarget_SignificantTerms("target", opLambda, null);
     }
 
-    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_SignificantTerms("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTarget_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "target");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -518,16 +518,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_IpRange(null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTarget_IpRange("target", opLambda, null);
     }
 
-    public void setTarget_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_IpRange("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "target");
+    public void setTarget_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -542,12 +543,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Count(null);
     }
 
-    public void setTarget_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTarget_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTarget_Count("target", opLambda);
     }
 
-    public void setTarget_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "target");
+    public void setTarget_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,12 +558,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Cardinality(null);
     }
 
-    public void setTarget_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTarget_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTarget_Cardinality("target", opLambda);
     }
 
-    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "target");
+    public void setTarget_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -572,16 +573,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setTarget_Missing(null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTarget_Missing("target", opLambda, null);
     }
 
-    public void setTarget_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setTarget_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setTarget_Missing("target", opLambda, aggsLambda);
     }
 
-    public void setTarget_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "target");
+    public void setTarget_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "target");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -592,22 +594,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String generator
-
     public void setGenerator_Terms() {
         setGenerator_Terms(null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setGenerator_Terms("generator", opLambda, null);
     }
 
-    public void setGenerator_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_Terms("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "generator");
+    public void setGenerator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -622,18 +623,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_SignificantTerms(null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setGenerator_SignificantTerms("generator", opLambda, null);
     }
 
-    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGenerator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_SignificantTerms("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGenerator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "generator");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,17 +649,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_IpRange(null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setGenerator_IpRange("generator", opLambda, null);
     }
 
-    public void setGenerator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_IpRange("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setGenerator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "generator");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -673,12 +674,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Count(null);
     }
 
-    public void setGenerator_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGenerator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGenerator_Count("generator", opLambda);
     }
 
-    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "generator");
+    public void setGenerator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -688,12 +689,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Cardinality(null);
     }
 
-    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGenerator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGenerator_Cardinality("generator", opLambda);
     }
 
-    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "generator");
+    public void setGenerator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -703,16 +704,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setGenerator_Missing(null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGenerator_Missing("generator", opLambda, null);
     }
 
-    public void setGenerator_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setGenerator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setGenerator_Missing("generator", opLambda, aggsLambda);
     }
 
-    public void setGenerator_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "generator");
+    public void setGenerator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "generator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -723,22 +725,21 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String path
-
     public void setPath_Terms() {
         setPath_Terms(null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPath_Terms("path", opLambda, null);
     }
 
-    public void setPath_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_Terms("path", opLambda, aggsLambda);
     }
 
-    public void setPath_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "path");
+    public void setPath_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -753,17 +754,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_SignificantTerms(null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPath_SignificantTerms("path", opLambda, null);
     }
 
-    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_SignificantTerms("path", opLambda, aggsLambda);
     }
 
-    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPath_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "path");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -778,16 +780,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_IpRange(null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPath_IpRange("path", opLambda, null);
     }
 
-    public void setPath_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_IpRange("path", opLambda, aggsLambda);
     }
 
-    public void setPath_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "path");
+    public void setPath_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -802,12 +805,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Count(null);
     }
 
-    public void setPath_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPath_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPath_Count("path", opLambda);
     }
 
-    public void setPath_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "path");
+    public void setPath_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -817,12 +820,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Cardinality(null);
     }
 
-    public void setPath_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPath_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPath_Cardinality("path", opLambda);
     }
 
-    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "path");
+    public void setPath_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -832,16 +835,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setPath_Missing(null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPath_Missing("path", opLambda, null);
     }
 
-    public void setPath_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setPath_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setPath_Missing("path", opLambda, aggsLambda);
     }
 
-    public void setPath_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "path");
+    public void setPath_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "path");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -852,22 +856,20 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String url
-
     public void setUrl_Terms() {
         setUrl_Terms(null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrl_Terms("url", opLambda, null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_Terms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "url");
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,17 +884,18 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_SignificantTerms(null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrl_SignificantTerms("url", opLambda, null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_SignificantTerms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "url");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,16 +910,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_IpRange(null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrl_IpRange("url", opLambda, null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_IpRange("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "url");
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -931,12 +935,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Count(null);
     }
 
-    public void setUrl_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrl_Count("url", opLambda);
     }
 
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "url");
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -946,12 +950,12 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Cardinality(null);
     }
 
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrl_Cardinality("url", opLambda);
     }
 
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "url");
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -961,16 +965,17 @@ public abstract class BsThumbnailQueueCA extends EsAbstractConditionAggregation
         setUrl_Missing(null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrl_Missing("url", opLambda, null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
         setUrl_Missing("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsThumbnailQueueCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "url");
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsThumbnailQueueCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
index 9e4db0e4a619c70845f51b3744d25fa99e0e948a..a8fa17a4daafece1902ee9ca23b05e2ddf24f706 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebAuthenticationCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.WebAuthenticationCA;
 import org.codelibs.fess.es.config.cbean.cq.WebAuthenticationCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebAuthenticationCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,35 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String authRealm
-
     public void setAuthRealm_Terms() {
         setAuthRealm_Terms(null);
     }
 
-    public void setAuthRealm_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setAuthRealm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setAuthRealm_Terms("authRealm", opLambda, null);
     }
 
-    public void setAuthRealm_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setAuthRealm_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setAuthRealm_Terms("authRealm", opLambda, aggsLambda);
     }
 
-    public void setAuthRealm_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "authRealm");
+    public void setAuthRealm_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,18 +135,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setAuthRealm_SignificantTerms(null);
     }
 
-    public void setAuthRealm_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setAuthRealm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setAuthRealm_SignificantTerms("authRealm", opLambda, null);
     }
 
-    public void setAuthRealm_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setAuthRealm_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setAuthRealm_SignificantTerms("authRealm", opLambda, aggsLambda);
     }
 
-    public void setAuthRealm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setAuthRealm_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "authRealm");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -162,17 +161,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setAuthRealm_IpRange(null);
     }
 
-    public void setAuthRealm_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setAuthRealm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setAuthRealm_IpRange("authRealm", opLambda, null);
     }
 
-    public void setAuthRealm_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setAuthRealm_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setAuthRealm_IpRange("authRealm", opLambda, aggsLambda);
     }
 
-    public void setAuthRealm_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setAuthRealm_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "authRealm");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -187,12 +186,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setAuthRealm_Count(null);
     }
 
-    public void setAuthRealm_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAuthRealm_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAuthRealm_Count("authRealm", opLambda);
     }
 
-    public void setAuthRealm_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "authRealm");
+    public void setAuthRealm_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -202,12 +201,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setAuthRealm_Cardinality(null);
     }
 
-    public void setAuthRealm_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAuthRealm_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAuthRealm_Cardinality("authRealm", opLambda);
     }
 
-    public void setAuthRealm_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "authRealm");
+    public void setAuthRealm_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -217,17 +216,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setAuthRealm_Missing(null);
     }
 
-    public void setAuthRealm_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAuthRealm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAuthRealm_Missing("authRealm", opLambda, null);
     }
 
-    public void setAuthRealm_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setAuthRealm_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setAuthRealm_Missing("authRealm", opLambda, aggsLambda);
     }
 
-    public void setAuthRealm_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setAuthRealm_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "authRealm");
+        MissingAggregationBuilder builder = regMissingA(name, "authRealm");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -238,22 +237,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -268,18 +266,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,17 +292,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,12 +317,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -334,12 +332,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,17 +347,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -370,17 +368,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -390,12 +387,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -405,12 +402,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -420,12 +417,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,12 +432,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -450,12 +447,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -465,12 +462,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,12 +477,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -495,17 +492,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,16 +518,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -544,12 +543,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -559,12 +558,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -574,17 +573,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -595,22 +595,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String hostname
-
     public void setHostname_Terms() {
         setHostname_Terms(null);
     }
 
-    public void setHostname_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHostname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHostname_Terms("hostname", opLambda, null);
     }
 
-    public void setHostname_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setHostname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setHostname_Terms("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "hostname");
+    public void setHostname_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -625,18 +624,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setHostname_SignificantTerms(null);
     }
 
-    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHostname_SignificantTerms("hostname", opLambda, null);
     }
 
-    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHostname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setHostname_SignificantTerms("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHostname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "hostname");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -651,17 +650,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setHostname_IpRange(null);
     }
 
-    public void setHostname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHostname_IpRange("hostname", opLambda, null);
     }
 
-    public void setHostname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setHostname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setHostname_IpRange("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setHostname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "hostname");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,12 +675,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setHostname_Count(null);
     }
 
-    public void setHostname_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHostname_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHostname_Count("hostname", opLambda);
     }
 
-    public void setHostname_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "hostname");
+    public void setHostname_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -691,12 +690,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setHostname_Cardinality(null);
     }
 
-    public void setHostname_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHostname_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHostname_Cardinality("hostname", opLambda);
     }
 
-    public void setHostname_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "hostname");
+    public void setHostname_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -706,17 +705,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setHostname_Missing(null);
     }
 
-    public void setHostname_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHostname_Missing("hostname", opLambda, null);
     }
 
-    public void setHostname_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setHostname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setHostname_Missing("hostname", opLambda, aggsLambda);
     }
 
-    public void setHostname_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setHostname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "hostname");
+        MissingAggregationBuilder builder = regMissingA(name, "hostname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -727,22 +726,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String parameters
-
     public void setParameters_Terms() {
         setParameters_Terms(null);
     }
 
-    public void setParameters_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setParameters_Terms("parameters", opLambda, null);
     }
 
-    public void setParameters_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setParameters_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setParameters_Terms("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "parameters");
+    public void setParameters_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -757,18 +755,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setParameters_SignificantTerms(null);
     }
 
-    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setParameters_SignificantTerms("parameters", opLambda, null);
     }
 
-    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameters_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setParameters_SignificantTerms("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setParameters_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "parameters");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -783,17 +781,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setParameters_IpRange(null);
     }
 
-    public void setParameters_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setParameters_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setParameters_IpRange("parameters", opLambda, null);
     }
 
-    public void setParameters_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setParameters_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setParameters_IpRange("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setParameters_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "parameters");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -808,12 +807,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setParameters_Count(null);
     }
 
-    public void setParameters_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setParameters_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setParameters_Count("parameters", opLambda);
     }
 
-    public void setParameters_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "parameters");
+    public void setParameters_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -823,12 +822,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setParameters_Cardinality(null);
     }
 
-    public void setParameters_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setParameters_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setParameters_Cardinality("parameters", opLambda);
     }
 
-    public void setParameters_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "parameters");
+    public void setParameters_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,17 +837,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setParameters_Missing(null);
     }
 
-    public void setParameters_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setParameters_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setParameters_Missing("parameters", opLambda, null);
     }
 
-    public void setParameters_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setParameters_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setParameters_Missing("parameters", opLambda, aggsLambda);
     }
 
-    public void setParameters_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setParameters_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "parameters");
+        MissingAggregationBuilder builder = regMissingA(name, "parameters");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -859,22 +859,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String password
-
     public void setPassword_Terms() {
         setPassword_Terms(null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPassword_Terms("password", opLambda, null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPassword_Terms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "password");
+    public void setPassword_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -889,18 +888,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPassword_SignificantTerms(null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPassword_SignificantTerms("password", opLambda, null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPassword_SignificantTerms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "password");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -915,17 +914,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPassword_IpRange(null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPassword_IpRange("password", opLambda, null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPassword_IpRange("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "password");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -940,12 +939,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPassword_Count(null);
     }
 
-    public void setPassword_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPassword_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPassword_Count("password", opLambda);
     }
 
-    public void setPassword_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "password");
+    public void setPassword_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -955,12 +954,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPassword_Cardinality(null);
     }
 
-    public void setPassword_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPassword_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPassword_Cardinality("password", opLambda);
     }
 
-    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "password");
+    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -970,17 +969,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPassword_Missing(null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPassword_Missing("password", opLambda, null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPassword_Missing("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "password");
+        MissingAggregationBuilder builder = regMissingA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -991,17 +990,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Integer port
     public void setPort_Avg() {
         setPort_Avg(null);
     }
 
-    public void setPort_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setPort_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setPort_Avg("port", opLambda);
     }
 
-    public void setPort_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "port");
+    public void setPort_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1011,12 +1009,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Max(null);
     }
 
-    public void setPort_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setPort_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setPort_Max("port", opLambda);
     }
 
-    public void setPort_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "port");
+    public void setPort_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1026,12 +1024,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Min(null);
     }
 
-    public void setPort_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setPort_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setPort_Min("port", opLambda);
     }
 
-    public void setPort_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "port");
+    public void setPort_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1041,12 +1039,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Sum(null);
     }
 
-    public void setPort_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setPort_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setPort_Sum("port", opLambda);
     }
 
-    public void setPort_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "port");
+    public void setPort_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,12 +1054,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_ExtendedStats(null);
     }
 
-    public void setPort_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setPort_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setPort_ExtendedStats("port", opLambda);
     }
 
-    public void setPort_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "port");
+    public void setPort_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1071,12 +1069,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Stats(null);
     }
 
-    public void setPort_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setPort_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setPort_Stats("port", opLambda);
     }
 
-    public void setPort_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "port");
+    public void setPort_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1086,12 +1084,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Percentiles(null);
     }
 
-    public void setPort_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setPort_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setPort_Percentiles("port", opLambda);
     }
 
-    public void setPort_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "port");
+    public void setPort_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,12 +1099,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_PercentileRanks(null);
     }
 
-    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setPort_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setPort_PercentileRanks("port", opLambda);
     }
 
-    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "port");
+    public void setPort_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1116,17 +1114,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Histogram(null);
     }
 
-    public void setPort_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setPort_Histogram("port", opLambda, null);
     }
 
-    public void setPort_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPort_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPort_Histogram("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setPort_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "port");
+        HistogramAggregationBuilder builder = regHistogramA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1141,16 +1139,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Range(null);
     }
 
-    public void setPort_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setPort_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setPort_Range("port", opLambda, null);
     }
 
-    public void setPort_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPort_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPort_Range("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "port");
+    public void setPort_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1165,12 +1164,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Count(null);
     }
 
-    public void setPort_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPort_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPort_Count("port", opLambda);
     }
 
-    public void setPort_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "port");
+    public void setPort_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1180,12 +1179,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Cardinality(null);
     }
 
-    public void setPort_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPort_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPort_Cardinality("port", opLambda);
     }
 
-    public void setPort_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "port");
+    public void setPort_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1195,16 +1194,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setPort_Missing(null);
     }
 
-    public void setPort_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPort_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPort_Missing("port", opLambda, null);
     }
 
-    public void setPort_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setPort_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setPort_Missing("port", opLambda, aggsLambda);
     }
 
-    public void setPort_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "port");
+    public void setPort_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "port");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1215,23 +1215,22 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String protocolScheme
-
     public void setProtocolScheme_Terms() {
         setProtocolScheme_Terms(null);
     }
 
-    public void setProtocolScheme_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setProtocolScheme_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setProtocolScheme_Terms("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setProtocolScheme_Terms("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setProtocolScheme_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "protocolScheme");
+        TermsAggregationBuilder builder = regTermsA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1246,18 +1245,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setProtocolScheme_SignificantTerms(null);
     }
 
-    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setProtocolScheme_SignificantTerms("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProtocolScheme_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setProtocolScheme_SignificantTerms("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setProtocolScheme_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "protocolScheme");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1272,17 +1271,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setProtocolScheme_IpRange(null);
     }
 
-    public void setProtocolScheme_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setProtocolScheme_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setProtocolScheme_IpRange("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setProtocolScheme_IpRange("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setProtocolScheme_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "protocolScheme");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,12 +1297,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setProtocolScheme_Count(null);
     }
 
-    public void setProtocolScheme_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setProtocolScheme_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setProtocolScheme_Count("protocolScheme", opLambda);
     }
 
-    public void setProtocolScheme_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "protocolScheme");
+    public void setProtocolScheme_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1312,12 +1312,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setProtocolScheme_Cardinality(null);
     }
 
-    public void setProtocolScheme_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setProtocolScheme_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setProtocolScheme_Cardinality("protocolScheme", opLambda);
     }
 
-    public void setProtocolScheme_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "protocolScheme");
+    public void setProtocolScheme_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1327,17 +1327,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setProtocolScheme_Missing(null);
     }
 
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setProtocolScheme_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setProtocolScheme_Missing("protocolScheme", opLambda, null);
     }
 
-    public void setProtocolScheme_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setProtocolScheme_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setProtocolScheme_Missing("protocolScheme", opLambda, aggsLambda);
     }
 
-    public void setProtocolScheme_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setProtocolScheme_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "protocolScheme");
+        MissingAggregationBuilder builder = regMissingA(name, "protocolScheme");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1348,22 +1349,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1378,18 +1378,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1404,17 +1404,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1429,12 +1429,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1444,12 +1444,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1459,17 +1459,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1480,17 +1480,16 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1500,12 +1499,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,12 +1514,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1530,12 +1529,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1545,12 +1544,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1560,12 +1559,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1575,12 +1574,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1590,12 +1589,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1605,17 +1604,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1630,16 +1630,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1654,12 +1655,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1669,12 +1670,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1684,17 +1685,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1705,22 +1707,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String username
-
     public void setUsername_Terms() {
         setUsername_Terms(null);
     }
 
-    public void setUsername_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUsername_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUsername_Terms("username", opLambda, null);
     }
 
-    public void setUsername_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUsername_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUsername_Terms("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "username");
+    public void setUsername_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1735,18 +1736,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUsername_SignificantTerms(null);
     }
 
-    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUsername_SignificantTerms("username", opLambda, null);
     }
 
-    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUsername_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUsername_SignificantTerms("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUsername_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "username");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1761,17 +1762,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUsername_IpRange(null);
     }
 
-    public void setUsername_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUsername_IpRange("username", opLambda, null);
     }
 
-    public void setUsername_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUsername_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUsername_IpRange("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setUsername_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "username");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1786,12 +1787,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUsername_Count(null);
     }
 
-    public void setUsername_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUsername_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUsername_Count("username", opLambda);
     }
 
-    public void setUsername_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "username");
+    public void setUsername_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1801,12 +1802,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUsername_Cardinality(null);
     }
 
-    public void setUsername_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUsername_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUsername_Cardinality("username", opLambda);
     }
 
-    public void setUsername_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "username");
+    public void setUsername_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1816,17 +1817,17 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setUsername_Missing(null);
     }
 
-    public void setUsername_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUsername_Missing("username", opLambda, null);
     }
 
-    public void setUsername_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setUsername_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setUsername_Missing("username", opLambda, aggsLambda);
     }
 
-    public void setUsername_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setUsername_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "username");
+        MissingAggregationBuilder builder = regMissingA(name, "username");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1837,22 +1838,21 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         }
     }
 
-    // String webConfigId
-
     public void setWebConfigId_Terms() {
         setWebConfigId_Terms(null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "webConfigId");
+    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1867,18 +1867,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setWebConfigId_SignificantTerms(null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "webConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1893,17 +1893,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setWebConfigId_IpRange(null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "webConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1918,12 +1919,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setWebConfigId_Count(null);
     }
 
-    public void setWebConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setWebConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setWebConfigId_Count("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "webConfigId");
+    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1933,12 +1934,12 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setWebConfigId_Cardinality(null);
     }
 
-    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setWebConfigId_Cardinality("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "webConfigId");
+    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1948,17 +1949,18 @@ public abstract class BsWebAuthenticationCA extends EsAbstractConditionAggregati
         setWebConfigId_Missing(null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebAuthenticationCA> aggsLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebAuthenticationCA> aggsLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebAuthenticationCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "webConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
index edc5e6eefc57b3df170a0c002f7e090c159505d3..2b9691e3f1e3d0d3d631df6d4f06861bf70e078d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.config.cbean.ca.WebConfigCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,31 +92,30 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // Boolean available
     public void setAvailable_Avg() {
         setAvailable_Avg(null);
     }
 
-    public void setAvailable_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setAvailable_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setAvailable_Avg("available", opLambda);
     }
 
-    public void setAvailable_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "available");
+    public void setAvailable_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,12 +125,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Max(null);
     }
 
-    public void setAvailable_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setAvailable_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setAvailable_Max("available", opLambda);
     }
 
-    public void setAvailable_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "available");
+    public void setAvailable_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -141,12 +140,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Min(null);
     }
 
-    public void setAvailable_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setAvailable_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setAvailable_Min("available", opLambda);
     }
 
-    public void setAvailable_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "available");
+    public void setAvailable_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -156,12 +155,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Sum(null);
     }
 
-    public void setAvailable_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setAvailable_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setAvailable_Sum("available", opLambda);
     }
 
-    public void setAvailable_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "available");
+    public void setAvailable_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -171,12 +170,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_ExtendedStats(null);
     }
 
-    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setAvailable_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setAvailable_ExtendedStats("available", opLambda);
     }
 
-    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "available");
+    public void setAvailable_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -186,12 +185,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Stats(null);
     }
 
-    public void setAvailable_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setAvailable_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setAvailable_Stats("available", opLambda);
     }
 
-    public void setAvailable_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "available");
+    public void setAvailable_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -201,12 +200,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Percentiles(null);
     }
 
-    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setAvailable_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setAvailable_Percentiles("available", opLambda);
     }
 
-    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "available");
+    public void setAvailable_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -216,12 +215,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_PercentileRanks(null);
     }
 
-    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setAvailable_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setAvailable_PercentileRanks("available", opLambda);
     }
 
-    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "available");
+    public void setAvailable_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -231,16 +230,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Histogram(null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setAvailable_Histogram("available", opLambda, null);
     }
 
-    public void setAvailable_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setAvailable_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setAvailable_Histogram("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "available");
+    public void setAvailable_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,16 +255,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Range(null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setAvailable_Range("available", opLambda, null);
     }
 
-    public void setAvailable_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setAvailable_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setAvailable_Range("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "available");
+    public void setAvailable_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -279,12 +280,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Count(null);
     }
 
-    public void setAvailable_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAvailable_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAvailable_Count("available", opLambda);
     }
 
-    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "available");
+    public void setAvailable_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,12 +295,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Cardinality(null);
     }
 
-    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAvailable_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAvailable_Cardinality("available", opLambda);
     }
 
-    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "available");
+    public void setAvailable_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,16 +310,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setAvailable_Missing(null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAvailable_Missing("available", opLambda, null);
     }
 
-    public void setAvailable_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setAvailable_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setAvailable_Missing("available", opLambda, aggsLambda);
     }
 
-    public void setAvailable_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "available");
+    public void setAvailable_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "available");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,17 +331,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Float boost
     public void setBoost_Avg() {
         setBoost_Avg(null);
     }
 
-    public void setBoost_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setBoost_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setBoost_Avg("boost", opLambda);
     }
 
-    public void setBoost_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "boost");
+    public void setBoost_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,12 +350,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Max(null);
     }
 
-    public void setBoost_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setBoost_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setBoost_Max("boost", opLambda);
     }
 
-    public void setBoost_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "boost");
+    public void setBoost_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,12 +365,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Min(null);
     }
 
-    public void setBoost_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setBoost_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setBoost_Min("boost", opLambda);
     }
 
-    public void setBoost_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "boost");
+    public void setBoost_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -379,12 +380,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Sum(null);
     }
 
-    public void setBoost_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setBoost_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setBoost_Sum("boost", opLambda);
     }
 
-    public void setBoost_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "boost");
+    public void setBoost_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -394,12 +395,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_ExtendedStats(null);
     }
 
-    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setBoost_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setBoost_ExtendedStats("boost", opLambda);
     }
 
-    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "boost");
+    public void setBoost_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -409,12 +410,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Stats(null);
     }
 
-    public void setBoost_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setBoost_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setBoost_Stats("boost", opLambda);
     }
 
-    public void setBoost_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "boost");
+    public void setBoost_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,12 +425,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Percentiles(null);
     }
 
-    public void setBoost_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setBoost_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setBoost_Percentiles("boost", opLambda);
     }
 
-    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "boost");
+    public void setBoost_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -439,12 +440,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_PercentileRanks(null);
     }
 
-    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setBoost_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setBoost_PercentileRanks("boost", opLambda);
     }
 
-    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "boost");
+    public void setBoost_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -454,16 +455,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Histogram(null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setBoost_Histogram("boost", opLambda, null);
     }
 
-    public void setBoost_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setBoost_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setBoost_Histogram("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "boost");
+    public void setBoost_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,16 +480,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Range(null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setBoost_Range("boost", opLambda, null);
     }
 
-    public void setBoost_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setBoost_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setBoost_Range("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "boost");
+    public void setBoost_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,12 +504,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Count(null);
     }
 
-    public void setBoost_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBoost_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBoost_Count("boost", opLambda);
     }
 
-    public void setBoost_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "boost");
+    public void setBoost_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -517,12 +519,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Cardinality(null);
     }
 
-    public void setBoost_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBoost_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBoost_Cardinality("boost", opLambda);
     }
 
-    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "boost");
+    public void setBoost_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -532,16 +534,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setBoost_Missing(null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBoost_Missing("boost", opLambda, null);
     }
 
-    public void setBoost_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setBoost_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setBoost_Missing("boost", opLambda, aggsLambda);
     }
 
-    public void setBoost_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "boost");
+    public void setBoost_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "boost");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -552,22 +555,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String configParameter
-
     public void setConfigParameter_Terms() {
         setConfigParameter_Terms(null);
     }
 
-    public void setConfigParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setConfigParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setConfigParameter_Terms("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setConfigParameter_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setConfigParameter_Terms("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "configParameter");
+    public void setConfigParameter_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -582,18 +584,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_SignificantTerms(null);
     }
 
-    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setConfigParameter_SignificantTerms("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setConfigParameter_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setConfigParameter_SignificantTerms("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setConfigParameter_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "configParameter");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -608,17 +610,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_IpRange(null);
     }
 
-    public void setConfigParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setConfigParameter_IpRange("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setConfigParameter_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setConfigParameter_IpRange("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setConfigParameter_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "configParameter");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,12 +635,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Count(null);
     }
 
-    public void setConfigParameter_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setConfigParameter_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setConfigParameter_Count("configParameter", opLambda);
     }
 
-    public void setConfigParameter_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "configParameter");
+    public void setConfigParameter_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -648,12 +650,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Cardinality(null);
     }
 
-    public void setConfigParameter_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setConfigParameter_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setConfigParameter_Cardinality("configParameter", opLambda);
     }
 
-    public void setConfigParameter_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "configParameter");
+    public void setConfigParameter_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,16 +665,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setConfigParameter_Missing(null);
     }
 
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setConfigParameter_Missing("configParameter", opLambda, null);
     }
 
-    public void setConfigParameter_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setConfigParameter_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setConfigParameter_Missing("configParameter", opLambda, aggsLambda);
     }
 
-    public void setConfigParameter_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "configParameter");
+    public void setConfigParameter_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "configParameter");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -683,22 +686,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String createdBy
-
     public void setCreatedBy_Terms() {
         setCreatedBy_Terms(null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCreatedBy_Terms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedBy_Terms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "createdBy");
+    public void setCreatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -713,17 +715,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_SignificantTerms(null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedBy_SignificantTerms("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCreatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "createdBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -738,16 +741,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_IpRange(null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedBy_IpRange("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "createdBy");
+    public void setCreatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -762,12 +766,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Count(null);
     }
 
-    public void setCreatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedBy_Count("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdBy");
+    public void setCreatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -777,12 +781,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Cardinality(null);
     }
 
-    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedBy_Cardinality("createdBy", opLambda);
     }
 
-    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdBy");
+    public void setCreatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -792,16 +796,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedBy_Missing(null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedBy_Missing("createdBy", opLambda, null);
     }
 
-    public void setCreatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedBy_Missing("createdBy", opLambda, aggsLambda);
     }
 
-    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdBy");
+    public void setCreatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -812,17 +817,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long createdTime
     public void setCreatedTime_Avg() {
         setCreatedTime_Avg(null);
     }
 
-    public void setCreatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setCreatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setCreatedTime_Avg("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "createdTime");
+    public void setCreatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -832,12 +836,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Max(null);
     }
 
-    public void setCreatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setCreatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setCreatedTime_Max("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "createdTime");
+    public void setCreatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -847,12 +851,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Min(null);
     }
 
-    public void setCreatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setCreatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setCreatedTime_Min("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "createdTime");
+    public void setCreatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -862,12 +866,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Sum(null);
     }
 
-    public void setCreatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setCreatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setCreatedTime_Sum("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "createdTime");
+    public void setCreatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -877,12 +881,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_ExtendedStats(null);
     }
 
-    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setCreatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setCreatedTime_ExtendedStats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "createdTime");
+    public void setCreatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -892,12 +896,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Stats(null);
     }
 
-    public void setCreatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setCreatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setCreatedTime_Stats("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "createdTime");
+    public void setCreatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -907,12 +911,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Percentiles(null);
     }
 
-    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setCreatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setCreatedTime_Percentiles("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "createdTime");
+    public void setCreatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -922,12 +926,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_PercentileRanks(null);
     }
 
-    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setCreatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setCreatedTime_PercentileRanks("createdTime", opLambda);
     }
 
-    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "createdTime");
+    public void setCreatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -937,16 +941,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Histogram(null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedTime_Histogram("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "createdTime");
+    public void setCreatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -961,16 +966,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Range(null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setCreatedTime_Range("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedTime_Range("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "createdTime");
+    public void setCreatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -985,12 +991,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Count(null);
     }
 
-    public void setCreatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedTime_Count("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdTime");
+    public void setCreatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1000,12 +1006,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Cardinality(null);
     }
 
-    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedTime_Cardinality("createdTime", opLambda);
     }
 
-    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdTime");
+    public void setCreatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1015,16 +1021,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setCreatedTime_Missing(null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedTime_Missing("createdTime", opLambda, null);
     }
 
-    public void setCreatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setCreatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setCreatedTime_Missing("createdTime", opLambda, aggsLambda);
     }
 
-    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdTime");
+    public void setCreatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1035,17 +1042,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer depth
     public void setDepth_Avg() {
         setDepth_Avg(null);
     }
 
-    public void setDepth_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setDepth_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setDepth_Avg("depth", opLambda);
     }
 
-    public void setDepth_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "depth");
+    public void setDepth_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1055,12 +1061,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Max(null);
     }
 
-    public void setDepth_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setDepth_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setDepth_Max("depth", opLambda);
     }
 
-    public void setDepth_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "depth");
+    public void setDepth_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1070,12 +1076,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Min(null);
     }
 
-    public void setDepth_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setDepth_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setDepth_Min("depth", opLambda);
     }
 
-    public void setDepth_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "depth");
+    public void setDepth_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1085,12 +1091,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Sum(null);
     }
 
-    public void setDepth_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setDepth_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setDepth_Sum("depth", opLambda);
     }
 
-    public void setDepth_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "depth");
+    public void setDepth_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,12 +1106,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_ExtendedStats(null);
     }
 
-    public void setDepth_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setDepth_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setDepth_ExtendedStats("depth", opLambda);
     }
 
-    public void setDepth_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "depth");
+    public void setDepth_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1115,12 +1121,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Stats(null);
     }
 
-    public void setDepth_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setDepth_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setDepth_Stats("depth", opLambda);
     }
 
-    public void setDepth_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "depth");
+    public void setDepth_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1130,12 +1136,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Percentiles(null);
     }
 
-    public void setDepth_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setDepth_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setDepth_Percentiles("depth", opLambda);
     }
 
-    public void setDepth_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "depth");
+    public void setDepth_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1145,12 +1151,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_PercentileRanks(null);
     }
 
-    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setDepth_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setDepth_PercentileRanks("depth", opLambda);
     }
 
-    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "depth");
+    public void setDepth_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1160,16 +1166,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Histogram(null);
     }
 
-    public void setDepth_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setDepth_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setDepth_Histogram("depth", opLambda, null);
     }
 
-    public void setDepth_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setDepth_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setDepth_Histogram("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "depth");
+    public void setDepth_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1184,16 +1191,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Range(null);
     }
 
-    public void setDepth_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setDepth_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setDepth_Range("depth", opLambda, null);
     }
 
-    public void setDepth_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setDepth_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setDepth_Range("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "depth");
+    public void setDepth_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1208,12 +1215,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Count(null);
     }
 
-    public void setDepth_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDepth_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDepth_Count("depth", opLambda);
     }
 
-    public void setDepth_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "depth");
+    public void setDepth_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1223,12 +1230,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Cardinality(null);
     }
 
-    public void setDepth_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDepth_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDepth_Cardinality("depth", opLambda);
     }
 
-    public void setDepth_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "depth");
+    public void setDepth_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1238,16 +1245,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setDepth_Missing(null);
     }
 
-    public void setDepth_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDepth_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDepth_Missing("depth", opLambda, null);
     }
 
-    public void setDepth_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setDepth_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setDepth_Missing("depth", opLambda, aggsLambda);
     }
 
-    public void setDepth_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "depth");
+    public void setDepth_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "depth");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1258,22 +1266,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String excludedDocUrls
-
     public void setExcludedDocUrls_Terms() {
         setExcludedDocUrls_Terms(null);
     }
 
-    public void setExcludedDocUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setExcludedDocUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setExcludedDocUrls_Terms("excludedDocUrls", opLambda, null);
     }
 
-    public void setExcludedDocUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedDocUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedDocUrls_Terms("excludedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocUrls_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "excludedDocUrls");
+    public void setExcludedDocUrls_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1288,18 +1295,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocUrls_SignificantTerms(null);
     }
 
-    public void setExcludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setExcludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setExcludedDocUrls_SignificantTerms("excludedDocUrls", opLambda, null);
     }
 
-    public void setExcludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedDocUrls_SignificantTerms("excludedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedDocUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "excludedDocUrls");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1314,17 +1321,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocUrls_IpRange(null);
     }
 
-    public void setExcludedDocUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setExcludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setExcludedDocUrls_IpRange("excludedDocUrls", opLambda, null);
     }
 
-    public void setExcludedDocUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedDocUrls_IpRange("excludedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocUrls_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setExcludedDocUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "excludedDocUrls");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1339,12 +1346,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocUrls_Count(null);
     }
 
-    public void setExcludedDocUrls_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExcludedDocUrls_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExcludedDocUrls_Count("excludedDocUrls", opLambda);
     }
 
-    public void setExcludedDocUrls_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "excludedDocUrls");
+    public void setExcludedDocUrls_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1354,12 +1361,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocUrls_Cardinality(null);
     }
 
-    public void setExcludedDocUrls_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExcludedDocUrls_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExcludedDocUrls_Cardinality("excludedDocUrls", opLambda);
     }
 
-    public void setExcludedDocUrls_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "excludedDocUrls");
+    public void setExcludedDocUrls_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1369,16 +1376,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedDocUrls_Missing(null);
     }
 
-    public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExcludedDocUrls_Missing("excludedDocUrls", opLambda, null);
     }
 
-    public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedDocUrls_Missing("excludedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedDocUrls_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "excludedDocUrls");
+    public void setExcludedDocUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "excludedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1389,22 +1397,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String excludedUrls
-
     public void setExcludedUrls_Terms() {
         setExcludedUrls_Terms(null);
     }
 
-    public void setExcludedUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setExcludedUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setExcludedUrls_Terms("excludedUrls", opLambda, null);
     }
 
-    public void setExcludedUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedUrls_Terms("excludedUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedUrls_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "excludedUrls");
+    public void setExcludedUrls_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1419,18 +1426,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedUrls_SignificantTerms(null);
     }
 
-    public void setExcludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setExcludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setExcludedUrls_SignificantTerms("excludedUrls", opLambda, null);
     }
 
-    public void setExcludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedUrls_SignificantTerms("excludedUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setExcludedUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "excludedUrls");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1445,16 +1452,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedUrls_IpRange(null);
     }
 
-    public void setExcludedUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setExcludedUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setExcludedUrls_IpRange("excludedUrls", opLambda, null);
     }
 
-    public void setExcludedUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedUrls_IpRange("excludedUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedUrls_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "excludedUrls");
+    public void setExcludedUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1469,12 +1477,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedUrls_Count(null);
     }
 
-    public void setExcludedUrls_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setExcludedUrls_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setExcludedUrls_Count("excludedUrls", opLambda);
     }
 
-    public void setExcludedUrls_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "excludedUrls");
+    public void setExcludedUrls_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1484,12 +1492,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedUrls_Cardinality(null);
     }
 
-    public void setExcludedUrls_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setExcludedUrls_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setExcludedUrls_Cardinality("excludedUrls", opLambda);
     }
 
-    public void setExcludedUrls_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "excludedUrls");
+    public void setExcludedUrls_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1499,16 +1507,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setExcludedUrls_Missing(null);
     }
 
-    public void setExcludedUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setExcludedUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setExcludedUrls_Missing("excludedUrls", opLambda, null);
     }
 
-    public void setExcludedUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setExcludedUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setExcludedUrls_Missing("excludedUrls", opLambda, aggsLambda);
     }
 
-    public void setExcludedUrls_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "excludedUrls");
+    public void setExcludedUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "excludedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1519,22 +1528,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String includedDocUrls
-
     public void setIncludedDocUrls_Terms() {
         setIncludedDocUrls_Terms(null);
     }
 
-    public void setIncludedDocUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setIncludedDocUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setIncludedDocUrls_Terms("includedDocUrls", opLambda, null);
     }
 
-    public void setIncludedDocUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedDocUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedDocUrls_Terms("includedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocUrls_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "includedDocUrls");
+    public void setIncludedDocUrls_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1549,18 +1557,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocUrls_SignificantTerms(null);
     }
 
-    public void setIncludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setIncludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setIncludedDocUrls_SignificantTerms("includedDocUrls", opLambda, null);
     }
 
-    public void setIncludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedDocUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedDocUrls_SignificantTerms("includedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedDocUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "includedDocUrls");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1575,17 +1583,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocUrls_IpRange(null);
     }
 
-    public void setIncludedDocUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setIncludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setIncludedDocUrls_IpRange("includedDocUrls", opLambda, null);
     }
 
-    public void setIncludedDocUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedDocUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedDocUrls_IpRange("includedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocUrls_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setIncludedDocUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "includedDocUrls");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1600,12 +1608,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocUrls_Count(null);
     }
 
-    public void setIncludedDocUrls_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIncludedDocUrls_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIncludedDocUrls_Count("includedDocUrls", opLambda);
     }
 
-    public void setIncludedDocUrls_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "includedDocUrls");
+    public void setIncludedDocUrls_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1615,12 +1623,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocUrls_Cardinality(null);
     }
 
-    public void setIncludedDocUrls_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIncludedDocUrls_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIncludedDocUrls_Cardinality("includedDocUrls", opLambda);
     }
 
-    public void setIncludedDocUrls_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "includedDocUrls");
+    public void setIncludedDocUrls_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1630,16 +1638,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedDocUrls_Missing(null);
     }
 
-    public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIncludedDocUrls_Missing("includedDocUrls", opLambda, null);
     }
 
-    public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedDocUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedDocUrls_Missing("includedDocUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedDocUrls_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "includedDocUrls");
+    public void setIncludedDocUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "includedDocUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1650,22 +1659,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String includedUrls
-
     public void setIncludedUrls_Terms() {
         setIncludedUrls_Terms(null);
     }
 
-    public void setIncludedUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setIncludedUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setIncludedUrls_Terms("includedUrls", opLambda, null);
     }
 
-    public void setIncludedUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedUrls_Terms("includedUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedUrls_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "includedUrls");
+    public void setIncludedUrls_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1680,18 +1688,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedUrls_SignificantTerms(null);
     }
 
-    public void setIncludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setIncludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setIncludedUrls_SignificantTerms("includedUrls", opLambda, null);
     }
 
-    public void setIncludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedUrls_SignificantTerms("includedUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setIncludedUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "includedUrls");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1706,16 +1714,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedUrls_IpRange(null);
     }
 
-    public void setIncludedUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setIncludedUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setIncludedUrls_IpRange("includedUrls", opLambda, null);
     }
 
-    public void setIncludedUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedUrls_IpRange("includedUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedUrls_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "includedUrls");
+    public void setIncludedUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1730,12 +1739,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedUrls_Count(null);
     }
 
-    public void setIncludedUrls_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIncludedUrls_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIncludedUrls_Count("includedUrls", opLambda);
     }
 
-    public void setIncludedUrls_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "includedUrls");
+    public void setIncludedUrls_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1745,12 +1754,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedUrls_Cardinality(null);
     }
 
-    public void setIncludedUrls_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIncludedUrls_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIncludedUrls_Cardinality("includedUrls", opLambda);
     }
 
-    public void setIncludedUrls_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "includedUrls");
+    public void setIncludedUrls_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1760,16 +1769,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIncludedUrls_Missing(null);
     }
 
-    public void setIncludedUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIncludedUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIncludedUrls_Missing("includedUrls", opLambda, null);
     }
 
-    public void setIncludedUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIncludedUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIncludedUrls_Missing("includedUrls", opLambda, aggsLambda);
     }
 
-    public void setIncludedUrls_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "includedUrls");
+    public void setIncludedUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "includedUrls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1780,17 +1790,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer intervalTime
     public void setIntervalTime_Avg() {
         setIntervalTime_Avg(null);
     }
 
-    public void setIntervalTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setIntervalTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setIntervalTime_Avg("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "intervalTime");
+    public void setIntervalTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1800,12 +1809,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Max(null);
     }
 
-    public void setIntervalTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setIntervalTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setIntervalTime_Max("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "intervalTime");
+    public void setIntervalTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1815,12 +1824,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Min(null);
     }
 
-    public void setIntervalTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setIntervalTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setIntervalTime_Min("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "intervalTime");
+    public void setIntervalTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1830,12 +1839,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Sum(null);
     }
 
-    public void setIntervalTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setIntervalTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setIntervalTime_Sum("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "intervalTime");
+    public void setIntervalTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1845,12 +1854,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_ExtendedStats(null);
     }
 
-    public void setIntervalTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setIntervalTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setIntervalTime_ExtendedStats("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "intervalTime");
+    public void setIntervalTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1860,12 +1869,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Stats(null);
     }
 
-    public void setIntervalTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setIntervalTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setIntervalTime_Stats("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "intervalTime");
+    public void setIntervalTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1875,12 +1884,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Percentiles(null);
     }
 
-    public void setIntervalTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setIntervalTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setIntervalTime_Percentiles("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "intervalTime");
+    public void setIntervalTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1890,12 +1899,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_PercentileRanks(null);
     }
 
-    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setIntervalTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setIntervalTime_PercentileRanks("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "intervalTime");
+    public void setIntervalTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1905,17 +1914,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Histogram(null);
     }
 
-    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setIntervalTime_Histogram("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIntervalTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIntervalTime_Histogram("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setIntervalTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "intervalTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1930,16 +1939,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Range(null);
     }
 
-    public void setIntervalTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setIntervalTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setIntervalTime_Range("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIntervalTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIntervalTime_Range("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "intervalTime");
+    public void setIntervalTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1954,12 +1964,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Count(null);
     }
 
-    public void setIntervalTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setIntervalTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setIntervalTime_Count("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "intervalTime");
+    public void setIntervalTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1969,12 +1979,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Cardinality(null);
     }
 
-    public void setIntervalTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setIntervalTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setIntervalTime_Cardinality("intervalTime", opLambda);
     }
 
-    public void setIntervalTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "intervalTime");
+    public void setIntervalTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1984,16 +1994,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setIntervalTime_Missing(null);
     }
 
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setIntervalTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setIntervalTime_Missing("intervalTime", opLambda, null);
     }
 
-    public void setIntervalTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setIntervalTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setIntervalTime_Missing("intervalTime", opLambda, aggsLambda);
     }
 
-    public void setIntervalTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "intervalTime");
+    public void setIntervalTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "intervalTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2004,17 +2015,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer timeToLive
     public void setTimeToLive_Avg() {
         setTimeToLive_Avg(null);
     }
 
-    public void setTimeToLive_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setTimeToLive_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setTimeToLive_Avg("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "timeToLive");
+    public void setTimeToLive_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2024,12 +2034,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Max(null);
     }
 
-    public void setTimeToLive_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setTimeToLive_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setTimeToLive_Max("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "timeToLive");
+    public void setTimeToLive_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2039,12 +2049,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Min(null);
     }
 
-    public void setTimeToLive_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setTimeToLive_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setTimeToLive_Min("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "timeToLive");
+    public void setTimeToLive_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2054,12 +2064,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Sum(null);
     }
 
-    public void setTimeToLive_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setTimeToLive_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setTimeToLive_Sum("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "timeToLive");
+    public void setTimeToLive_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2069,12 +2079,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_ExtendedStats(null);
     }
 
-    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setTimeToLive_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setTimeToLive_ExtendedStats("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "timeToLive");
+    public void setTimeToLive_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2084,12 +2094,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Stats(null);
     }
 
-    public void setTimeToLive_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setTimeToLive_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setTimeToLive_Stats("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "timeToLive");
+    public void setTimeToLive_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2099,12 +2109,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Percentiles(null);
     }
 
-    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setTimeToLive_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setTimeToLive_Percentiles("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "timeToLive");
+    public void setTimeToLive_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2114,12 +2124,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_PercentileRanks(null);
     }
 
-    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setTimeToLive_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setTimeToLive_PercentileRanks("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "timeToLive");
+    public void setTimeToLive_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2129,16 +2139,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Histogram(null);
     }
 
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setTimeToLive_Histogram("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setTimeToLive_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setTimeToLive_Histogram("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "timeToLive");
+    public void setTimeToLive_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2153,16 +2164,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Range(null);
     }
 
-    public void setTimeToLive_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setTimeToLive_Range("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setTimeToLive_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setTimeToLive_Range("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "timeToLive");
+    public void setTimeToLive_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2177,12 +2189,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Count(null);
     }
 
-    public void setTimeToLive_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTimeToLive_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTimeToLive_Count("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "timeToLive");
+    public void setTimeToLive_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2192,12 +2204,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Cardinality(null);
     }
 
-    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTimeToLive_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTimeToLive_Cardinality("timeToLive", opLambda);
     }
 
-    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "timeToLive");
+    public void setTimeToLive_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2207,16 +2219,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setTimeToLive_Missing(null);
     }
 
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTimeToLive_Missing("timeToLive", opLambda, null);
     }
 
-    public void setTimeToLive_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setTimeToLive_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setTimeToLive_Missing("timeToLive", opLambda, aggsLambda);
     }
 
-    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "timeToLive");
+    public void setTimeToLive_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "timeToLive");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2227,17 +2240,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long maxAccessCount
     public void setMaxAccessCount_Avg() {
         setMaxAccessCount_Avg(null);
     }
 
-    public void setMaxAccessCount_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setMaxAccessCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setMaxAccessCount_Avg("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "maxAccessCount");
+    public void setMaxAccessCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2247,12 +2259,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Max(null);
     }
 
-    public void setMaxAccessCount_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setMaxAccessCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setMaxAccessCount_Max("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "maxAccessCount");
+    public void setMaxAccessCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2262,12 +2274,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Min(null);
     }
 
-    public void setMaxAccessCount_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setMaxAccessCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setMaxAccessCount_Min("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "maxAccessCount");
+    public void setMaxAccessCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2277,12 +2289,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Sum(null);
     }
 
-    public void setMaxAccessCount_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setMaxAccessCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setMaxAccessCount_Sum("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "maxAccessCount");
+    public void setMaxAccessCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2292,12 +2304,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_ExtendedStats(null);
     }
 
-    public void setMaxAccessCount_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setMaxAccessCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setMaxAccessCount_ExtendedStats("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "maxAccessCount");
+    public void setMaxAccessCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2307,12 +2319,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Stats(null);
     }
 
-    public void setMaxAccessCount_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setMaxAccessCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setMaxAccessCount_Stats("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "maxAccessCount");
+    public void setMaxAccessCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2322,12 +2334,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Percentiles(null);
     }
 
-    public void setMaxAccessCount_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setMaxAccessCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setMaxAccessCount_Percentiles("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "maxAccessCount");
+    public void setMaxAccessCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2337,12 +2349,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_PercentileRanks(null);
     }
 
-    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setMaxAccessCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setMaxAccessCount_PercentileRanks("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "maxAccessCount");
+    public void setMaxAccessCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2352,17 +2364,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Histogram(null);
     }
 
-    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setMaxAccessCount_Histogram("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setMaxAccessCount_Histogram("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setMaxAccessCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "maxAccessCount");
+        HistogramAggregationBuilder builder = regHistogramA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2377,16 +2390,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Range(null);
     }
 
-    public void setMaxAccessCount_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setMaxAccessCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setMaxAccessCount_Range("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setMaxAccessCount_Range("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "maxAccessCount");
+    public void setMaxAccessCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2401,12 +2415,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Count(null);
     }
 
-    public void setMaxAccessCount_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setMaxAccessCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setMaxAccessCount_Count("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "maxAccessCount");
+    public void setMaxAccessCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2416,12 +2430,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Cardinality(null);
     }
 
-    public void setMaxAccessCount_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setMaxAccessCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setMaxAccessCount_Cardinality("maxAccessCount", opLambda);
     }
 
-    public void setMaxAccessCount_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "maxAccessCount");
+    public void setMaxAccessCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2431,16 +2445,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setMaxAccessCount_Missing(null);
     }
 
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setMaxAccessCount_Missing("maxAccessCount", opLambda, null);
     }
 
-    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setMaxAccessCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setMaxAccessCount_Missing("maxAccessCount", opLambda, aggsLambda);
     }
 
-    public void setMaxAccessCount_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "maxAccessCount");
+    public void setMaxAccessCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "maxAccessCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2451,22 +2466,20 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2481,17 +2494,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2506,16 +2520,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2530,12 +2544,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2545,12 +2559,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2560,16 +2574,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2580,17 +2594,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer numOfThread
     public void setNumOfThread_Avg() {
         setNumOfThread_Avg(null);
     }
 
-    public void setNumOfThread_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setNumOfThread_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setNumOfThread_Avg("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "numOfThread");
+    public void setNumOfThread_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2600,12 +2613,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Max(null);
     }
 
-    public void setNumOfThread_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setNumOfThread_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setNumOfThread_Max("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "numOfThread");
+    public void setNumOfThread_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2615,12 +2628,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Min(null);
     }
 
-    public void setNumOfThread_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setNumOfThread_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setNumOfThread_Min("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "numOfThread");
+    public void setNumOfThread_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2630,12 +2643,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Sum(null);
     }
 
-    public void setNumOfThread_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setNumOfThread_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setNumOfThread_Sum("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "numOfThread");
+    public void setNumOfThread_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2645,12 +2658,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_ExtendedStats(null);
     }
 
-    public void setNumOfThread_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setNumOfThread_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setNumOfThread_ExtendedStats("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "numOfThread");
+    public void setNumOfThread_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2660,12 +2673,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Stats(null);
     }
 
-    public void setNumOfThread_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setNumOfThread_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setNumOfThread_Stats("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "numOfThread");
+    public void setNumOfThread_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2675,12 +2688,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Percentiles(null);
     }
 
-    public void setNumOfThread_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setNumOfThread_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setNumOfThread_Percentiles("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "numOfThread");
+    public void setNumOfThread_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2690,12 +2703,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_PercentileRanks(null);
     }
 
-    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setNumOfThread_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setNumOfThread_PercentileRanks("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "numOfThread");
+    public void setNumOfThread_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2705,16 +2718,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Histogram(null);
     }
 
-    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setNumOfThread_Histogram("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setNumOfThread_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setNumOfThread_Histogram("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "numOfThread");
+    public void setNumOfThread_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2729,16 +2743,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Range(null);
     }
 
-    public void setNumOfThread_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setNumOfThread_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setNumOfThread_Range("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setNumOfThread_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setNumOfThread_Range("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "numOfThread");
+    public void setNumOfThread_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2753,12 +2768,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Count(null);
     }
 
-    public void setNumOfThread_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setNumOfThread_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setNumOfThread_Count("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "numOfThread");
+    public void setNumOfThread_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2768,12 +2783,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Cardinality(null);
     }
 
-    public void setNumOfThread_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setNumOfThread_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setNumOfThread_Cardinality("numOfThread", opLambda);
     }
 
-    public void setNumOfThread_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "numOfThread");
+    public void setNumOfThread_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2783,16 +2798,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setNumOfThread_Missing(null);
     }
 
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setNumOfThread_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setNumOfThread_Missing("numOfThread", opLambda, null);
     }
 
-    public void setNumOfThread_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setNumOfThread_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setNumOfThread_Missing("numOfThread", opLambda, aggsLambda);
     }
 
-    public void setNumOfThread_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "numOfThread");
+    public void setNumOfThread_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "numOfThread");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2803,22 +2819,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String permissions
-
     public void setPermissions_Terms() {
         setPermissions_Terms(null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPermissions_Terms("permissions", opLambda, null);
     }
 
-    public void setPermissions_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setPermissions_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setPermissions_Terms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "permissions");
+    public void setPermissions_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2833,18 +2848,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setPermissions_SignificantTerms(null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, null);
     }
 
-    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
         setPermissions_SignificantTerms("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPermissions_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "permissions");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2859,16 +2874,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setPermissions_IpRange(null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPermissions_IpRange("permissions", opLambda, null);
     }
 
-    public void setPermissions_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setPermissions_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setPermissions_IpRange("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "permissions");
+    public void setPermissions_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2883,12 +2899,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Count(null);
     }
 
-    public void setPermissions_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPermissions_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPermissions_Count("permissions", opLambda);
     }
 
-    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "permissions");
+    public void setPermissions_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2898,12 +2914,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Cardinality(null);
     }
 
-    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPermissions_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPermissions_Cardinality("permissions", opLambda);
     }
 
-    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "permissions");
+    public void setPermissions_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2913,16 +2929,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setPermissions_Missing(null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPermissions_Missing("permissions", opLambda, null);
     }
 
-    public void setPermissions_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setPermissions_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setPermissions_Missing("permissions", opLambda, aggsLambda);
     }
 
-    public void setPermissions_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "permissions");
+    public void setPermissions_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "permissions");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2933,17 +2950,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer sortOrder
     public void setSortOrder_Avg() {
         setSortOrder_Avg(null);
     }
 
-    public void setSortOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setSortOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setSortOrder_Avg("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "sortOrder");
+    public void setSortOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2953,12 +2969,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Max(null);
     }
 
-    public void setSortOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setSortOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setSortOrder_Max("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "sortOrder");
+    public void setSortOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2968,12 +2984,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Min(null);
     }
 
-    public void setSortOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setSortOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setSortOrder_Min("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "sortOrder");
+    public void setSortOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2983,12 +2999,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Sum(null);
     }
 
-    public void setSortOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setSortOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setSortOrder_Sum("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "sortOrder");
+    public void setSortOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2998,12 +3014,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_ExtendedStats(null);
     }
 
-    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setSortOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setSortOrder_ExtendedStats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "sortOrder");
+    public void setSortOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3013,12 +3029,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Stats(null);
     }
 
-    public void setSortOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setSortOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setSortOrder_Stats("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "sortOrder");
+    public void setSortOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3028,12 +3044,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Percentiles(null);
     }
 
-    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setSortOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setSortOrder_Percentiles("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "sortOrder");
+    public void setSortOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3043,12 +3059,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_PercentileRanks(null);
     }
 
-    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setSortOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setSortOrder_PercentileRanks("sortOrder", opLambda);
     }
 
-    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "sortOrder");
+    public void setSortOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3058,16 +3074,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Histogram(null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setSortOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setSortOrder_Histogram("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "sortOrder");
+    public void setSortOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3082,16 +3099,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Range(null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setSortOrder_Range("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setSortOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setSortOrder_Range("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "sortOrder");
+    public void setSortOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3106,12 +3124,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Count(null);
     }
 
-    public void setSortOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSortOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSortOrder_Count("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "sortOrder");
+    public void setSortOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3121,12 +3139,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Cardinality(null);
     }
 
-    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSortOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSortOrder_Cardinality("sortOrder", opLambda);
     }
 
-    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "sortOrder");
+    public void setSortOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3136,16 +3154,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setSortOrder_Missing(null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSortOrder_Missing("sortOrder", opLambda, null);
     }
 
-    public void setSortOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setSortOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setSortOrder_Missing("sortOrder", opLambda, aggsLambda);
     }
 
-    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "sortOrder");
+    public void setSortOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "sortOrder");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3156,22 +3175,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String updatedBy
-
     public void setUpdatedBy_Terms() {
         setUpdatedBy_Terms(null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedBy_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedBy_Terms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "updatedBy");
+    public void setUpdatedBy_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3186,17 +3204,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_SignificantTerms(null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedBy_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedBy_SignificantTerms("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUpdatedBy_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "updatedBy");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3211,16 +3230,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_IpRange(null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedBy_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedBy_IpRange("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "updatedBy");
+    public void setUpdatedBy_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3235,12 +3255,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Count(null);
     }
 
-    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedBy_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedBy_Count("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedBy");
+    public void setUpdatedBy_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3250,12 +3270,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Cardinality(null);
     }
 
-    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedBy_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedBy_Cardinality("updatedBy", opLambda);
     }
 
-    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedBy");
+    public void setUpdatedBy_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3265,16 +3285,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedBy_Missing(null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, null);
     }
 
-    public void setUpdatedBy_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedBy_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedBy_Missing("updatedBy", opLambda, aggsLambda);
     }
 
-    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedBy");
+    public void setUpdatedBy_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedBy");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3285,17 +3306,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long updatedTime
     public void setUpdatedTime_Avg() {
         setUpdatedTime_Avg(null);
     }
 
-    public void setUpdatedTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUpdatedTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUpdatedTime_Avg("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "updatedTime");
+    public void setUpdatedTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3305,12 +3325,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Max(null);
     }
 
-    public void setUpdatedTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUpdatedTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUpdatedTime_Max("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "updatedTime");
+    public void setUpdatedTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3320,12 +3340,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Min(null);
     }
 
-    public void setUpdatedTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUpdatedTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUpdatedTime_Min("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "updatedTime");
+    public void setUpdatedTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3335,12 +3355,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Sum(null);
     }
 
-    public void setUpdatedTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUpdatedTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUpdatedTime_Sum("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "updatedTime");
+    public void setUpdatedTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3350,12 +3370,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_ExtendedStats(null);
     }
 
-    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUpdatedTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUpdatedTime_ExtendedStats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "updatedTime");
+    public void setUpdatedTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3365,12 +3385,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Stats(null);
     }
 
-    public void setUpdatedTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUpdatedTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUpdatedTime_Stats("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "updatedTime");
+    public void setUpdatedTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3380,12 +3400,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Percentiles(null);
     }
 
-    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUpdatedTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUpdatedTime_Percentiles("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "updatedTime");
+    public void setUpdatedTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3395,12 +3415,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_PercentileRanks(null);
     }
 
-    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUpdatedTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUpdatedTime_PercentileRanks("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "updatedTime");
+    public void setUpdatedTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3410,16 +3430,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Histogram(null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedTime_Histogram("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "updatedTime");
+    public void setUpdatedTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3434,16 +3455,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Range(null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedTime_Range("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "updatedTime");
+    public void setUpdatedTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3458,12 +3480,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Count(null);
     }
 
-    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedTime_Count("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedTime");
+    public void setUpdatedTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3473,12 +3495,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Cardinality(null);
     }
 
-    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedTime_Cardinality("updatedTime", opLambda);
     }
 
-    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedTime");
+    public void setUpdatedTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3488,16 +3510,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUpdatedTime_Missing(null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, null);
     }
 
-    public void setUpdatedTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUpdatedTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUpdatedTime_Missing("updatedTime", opLambda, aggsLambda);
     }
 
-    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedTime");
+    public void setUpdatedTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3508,22 +3531,20 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String urls
-
     public void setUrls_Terms() {
         setUrls_Terms(null);
     }
 
-    public void setUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrls_Terms("urls", opLambda, null);
     }
 
-    public void setUrls_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUrls_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUrls_Terms("urls", opLambda, aggsLambda);
     }
 
-    public void setUrls_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "urls");
+    public void setUrls_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3538,17 +3559,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUrls_SignificantTerms(null);
     }
 
-    public void setUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrls_SignificantTerms("urls", opLambda, null);
     }
 
-    public void setUrls_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUrls_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setUrls_SignificantTerms("urls", opLambda, aggsLambda);
     }
 
-    public void setUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrls_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "urls");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3563,16 +3585,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUrls_IpRange(null);
     }
 
-    public void setUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrls_IpRange("urls", opLambda, null);
     }
 
-    public void setUrls_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUrls_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUrls_IpRange("urls", opLambda, aggsLambda);
     }
 
-    public void setUrls_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "urls");
+    public void setUrls_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3587,12 +3609,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUrls_Count(null);
     }
 
-    public void setUrls_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrls_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrls_Count("urls", opLambda);
     }
 
-    public void setUrls_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "urls");
+    public void setUrls_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3602,12 +3624,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUrls_Cardinality(null);
     }
 
-    public void setUrls_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrls_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrls_Cardinality("urls", opLambda);
     }
 
-    public void setUrls_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "urls");
+    public void setUrls_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3617,16 +3639,16 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUrls_Missing(null);
     }
 
-    public void setUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrls_Missing("urls", opLambda, null);
     }
 
-    public void setUrls_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUrls_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUrls_Missing("urls", opLambda, aggsLambda);
     }
 
-    public void setUrls_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "urls");
+    public void setUrls_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "urls");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3637,22 +3659,21 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userAgent
-
     public void setUserAgent_Terms() {
         setUserAgent_Terms(null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserAgent_Terms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUserAgent_Terms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userAgent");
+    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3667,17 +3688,18 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUserAgent_SignificantTerms(null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userAgent");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3692,16 +3714,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUserAgent_IpRange(null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserAgent_IpRange("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUserAgent_IpRange("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userAgent");
+    public void setUserAgent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3716,12 +3739,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUserAgent_Count(null);
     }
 
-    public void setUserAgent_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserAgent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserAgent_Count("userAgent", opLambda);
     }
 
-    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userAgent");
+    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3731,12 +3754,12 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUserAgent_Cardinality(null);
     }
 
-    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserAgent_Cardinality("userAgent", opLambda);
     }
 
-    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userAgent");
+    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3746,16 +3769,17 @@ public abstract class BsWebConfigCA extends EsAbstractConditionAggregation {
         setUserAgent_Missing(null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserAgent_Missing("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
         setUserAgent_Missing("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userAgent");
+    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToLabelCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToLabelCA.java
index 73b5127f826a0073058aa9ed1d10a8e4de3ad2e5..c2774e667d4ce526a6aa3bb15be923f10ed912d8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToLabelCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToLabelCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.WebConfigToLabelCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToLabelCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigToLabelCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String labelTypeId
-
     public void setLabelTypeId_Terms() {
         setLabelTypeId_Terms(null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Terms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labelTypeId");
+    public void setLabelTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_SignificantTerms(null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_SignificantTerms("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabelTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labelTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_IpRange(null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_IpRange("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setLabelTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labelTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +177,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Count(null);
     }
 
-    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabelTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabelTypeId_Count("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labelTypeId");
+    public void setLabelTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +192,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Cardinality(null);
     }
 
-    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabelTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabelTypeId_Cardinality("labelTypeId", opLambda);
     }
 
-    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labelTypeId");
+    public void setLabelTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +207,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setLabelTypeId_Missing(null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, null);
     }
 
-    public void setLabelTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setLabelTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setLabelTypeId_Missing("labelTypeId", opLambda, aggsLambda);
     }
 
-    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setLabelTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labelTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "labelTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +229,21 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         }
     }
 
-    // String webConfigId
-
     public void setWebConfigId_Terms() {
         setWebConfigId_Terms(null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "webConfigId");
+    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +258,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_SignificantTerms(null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "webConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +284,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_IpRange(null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "webConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +310,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Count(null);
     }
 
-    public void setWebConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setWebConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setWebConfigId_Count("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "webConfigId");
+    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +325,12 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Cardinality(null);
     }
 
-    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setWebConfigId_Cardinality("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "webConfigId");
+    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +340,18 @@ public abstract class BsWebConfigToLabelCA extends EsAbstractConditionAggregatio
         setWebConfigId_Missing(null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToLabelCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "webConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToRoleCA.java b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToRoleCA.java
index 1bf3c3e9bc3fd532d346f9cbd3e9509f66cf2c2a..8c0afe2e5156cb6759a856b9de775e774137302e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/ca/bs/BsWebConfigToRoleCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.config.cbean.ca.WebConfigToRoleCA;
 import org.codelibs.fess.es.config.cbean.cq.WebConfigToRoleCQ;
 import org.codelibs.fess.es.config.cbean.cq.bs.BsWebConfigToRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String roleTypeId
-
     public void setRoleTypeId_Terms() {
         setRoleTypeId_Terms(null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Terms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roleTypeId");
+    public void setRoleTypeId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,18 +125,18 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setRoleTypeId_SignificantTerms(null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setRoleTypeId_SignificantTerms("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoleTypeId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roleTypeId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -152,17 +151,17 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setRoleTypeId_IpRange(null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setRoleTypeId_IpRange("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setRoleTypeId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roleTypeId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -177,12 +176,12 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setRoleTypeId_Count(null);
     }
 
-    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoleTypeId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoleTypeId_Count("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roleTypeId");
+    public void setRoleTypeId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -192,12 +191,12 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setRoleTypeId_Cardinality(null);
     }
 
-    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoleTypeId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoleTypeId_Cardinality("roleTypeId", opLambda);
     }
 
-    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roleTypeId");
+    public void setRoleTypeId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -207,17 +206,17 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setRoleTypeId_Missing(null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, null);
     }
 
-    public void setRoleTypeId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setRoleTypeId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setRoleTypeId_Missing("roleTypeId", opLambda, aggsLambda);
     }
 
-    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setRoleTypeId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roleTypeId");
+        MissingAggregationBuilder builder = regMissingA(name, "roleTypeId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -228,22 +227,21 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String webConfigId
-
     public void setWebConfigId_Terms() {
         setWebConfigId_Terms(null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setWebConfigId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setWebConfigId_Terms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "webConfigId");
+    public void setWebConfigId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,18 +256,18 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setWebConfigId_SignificantTerms(null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setWebConfigId_SignificantTerms("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setWebConfigId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "webConfigId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,17 +282,17 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setWebConfigId_IpRange(null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setWebConfigId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setWebConfigId_IpRange("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setWebConfigId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "webConfigId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -309,12 +307,12 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setWebConfigId_Count(null);
     }
 
-    public void setWebConfigId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setWebConfigId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setWebConfigId_Count("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "webConfigId");
+    public void setWebConfigId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -324,12 +322,12 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setWebConfigId_Cardinality(null);
     }
 
-    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setWebConfigId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setWebConfigId_Cardinality("webConfigId", opLambda);
     }
 
-    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "webConfigId");
+    public void setWebConfigId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,17 +337,17 @@ public abstract class BsWebConfigToRoleCA extends EsAbstractConditionAggregation
         setWebConfigId_Missing(null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, null);
     }
 
-    public void setWebConfigId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
+    public void setWebConfigId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
         setWebConfigId_Missing("webConfigId", opLambda, aggsLambda);
     }
 
-    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setWebConfigId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsWebConfigToRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "webConfigId");
+        MissingAggregationBuilder builder = regMissingA(name, "webConfigId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
index 5b26121edd68dbbf44c0fb615499d8d14ce36e28..9100329199ec360b3e2e55b9916c26b5c5ddba1d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsAccessTokenCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         AccessTokenCQ cq = new AccessTokenCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 AccessTokenCQ cf = new AccessTokenCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setToken_MatchPhrase(token, null);
     }
 
-    public void setToken_MatchPhrase(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("token", token);
+    public void setToken_MatchPhrase(String token, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setToken_MatchPhrasePrefix(token, null);
     }
 
-    public void setToken_MatchPhrasePrefix(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("token", token);
+    public void setToken_MatchPhrasePrefix(String token, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setToken_Fuzzy(token, null);
     }
 
-    public void setToken_Fuzzy(String token, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("token", token);
+    public void setToken_Fuzzy(String token, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("token", token);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setToken_SpanTerm(String token) {
+        setToken_SpanTerm("token", null);
+    }
+
+    public void setToken_SpanTerm(String token, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("token", token);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setToken_GreaterThan(String token) {
         setToken_GreaterThan(token, null);
     }
 
     public void setToken_GreaterThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_THAN, token);
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setToken_LessThan(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_THAN, token);
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setToken_GreaterEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_EQUAL, token);
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setToken_LessEqual(String token, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_EQUAL, token);
+        final Object _value = token;
+        RangeQueryBuilder builder = regRangeQ("token", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -664,8 +699,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,8 +710,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,8 +721,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -726,12 +761,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -742,7 +789,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -753,7 +801,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -764,7 +813,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -871,8 +921,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setParameterName_MatchPhrase(parameterName, null);
     }
 
-    public void setParameterName_MatchPhrase(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("parameter_name", parameterName);
+    public void setParameterName_MatchPhrase(String parameterName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,8 +932,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setParameterName_MatchPhrasePrefix(parameterName, null);
     }
 
-    public void setParameterName_MatchPhrasePrefix(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("parameter_name", parameterName);
+    public void setParameterName_MatchPhrasePrefix(String parameterName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,8 +943,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setParameterName_Fuzzy(parameterName, null);
     }
 
-    public void setParameterName_Fuzzy(String parameterName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("parameter_name", parameterName);
+    public void setParameterName_Fuzzy(String parameterName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("parameter_name", parameterName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -933,12 +983,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setParameterName_SpanTerm(String parameterName) {
+        setParameterName_SpanTerm("parameter_name", null);
+    }
+
+    public void setParameterName_SpanTerm(String parameterName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("parameter_name", parameterName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setParameterName_GreaterThan(String parameterName) {
         setParameterName_GreaterThan(parameterName, null);
     }
 
     public void setParameterName_GreaterThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_THAN, parameterName);
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -949,7 +1011,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameterName_LessThan(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_THAN, parameterName);
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -960,7 +1023,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameterName_GreaterEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_EQUAL, parameterName);
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -971,7 +1035,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameterName_LessEqual(String parameterName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_EQUAL, parameterName);
+        final Object _value = parameterName;
+        RangeQueryBuilder builder = regRangeQ("parameter_name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1078,8 +1143,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setExpiredTime_MatchPhrase(expiredTime, null);
     }
 
-    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
+    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,8 +1154,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setExpiredTime_MatchPhrasePrefix(expiredTime, null);
     }
 
-    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
+    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,8 +1165,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setExpiredTime_Fuzzy(expiredTime, null);
     }
 
-    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
+    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,7 +1177,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_GreaterThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,7 +1189,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_LessThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,7 +1201,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_GreaterEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1145,7 +1213,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_LessEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,8 +1321,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,8 +1332,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1274,8 +1343,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1314,12 +1383,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1330,7 +1411,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1341,7 +1423,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1352,7 +1435,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1459,8 +1543,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1470,8 +1554,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1481,8 +1565,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1493,7 +1577,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1504,7 +1589,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,7 +1601,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,7 +1613,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1633,8 +1721,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1644,8 +1732,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,8 +1743,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1695,12 +1783,24 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1711,7 +1811,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1722,7 +1823,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1733,7 +1835,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1840,8 +1943,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1851,8 +1954,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1862,8 +1965,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1874,7 +1977,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1885,7 +1989,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1896,7 +2001,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1907,7 +2013,8 @@ public abstract class BsAccessTokenCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
index 27077b827fa54f9f896226073dd752be7a1228b0..7cc79485dc9d96d13a3ab25cb5d6aa69cefbe7f9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBadWordCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         BadWordCQ cq = new BadWordCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 BadWordCQ cf = new BadWordCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +510,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,8 +654,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_MatchPhrase(suggestWord, null);
     }
 
-    public void setSuggestWord_MatchPhrase(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("suggestWord", suggestWord);
+    public void setSuggestWord_MatchPhrase(String suggestWord, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -641,8 +665,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_MatchPhrasePrefix(suggestWord, null);
     }
 
-    public void setSuggestWord_MatchPhrasePrefix(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("suggestWord", suggestWord);
+    public void setSuggestWord_MatchPhrasePrefix(String suggestWord, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,8 +676,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_Fuzzy(suggestWord, null);
     }
 
-    public void setSuggestWord_Fuzzy(String suggestWord, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("suggestWord", suggestWord);
+    public void setSuggestWord_Fuzzy(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -692,12 +716,24 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSuggestWord_SpanTerm(String suggestWord) {
+        setSuggestWord_SpanTerm("suggestWord", null);
+    }
+
+    public void setSuggestWord_SpanTerm(String suggestWord, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("suggestWord", suggestWord);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSuggestWord_GreaterThan(String suggestWord) {
         setSuggestWord_GreaterThan(suggestWord, null);
     }
 
     public void setSuggestWord_GreaterThan(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_THAN, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -708,7 +744,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_LessThan(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_THAN, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,7 +756,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_GreaterEqual(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_EQUAL, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -730,7 +768,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_LessEqual(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_EQUAL, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -837,8 +876,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_MatchPhrase(targetLabel, null);
     }
 
-    public void setTargetLabel_MatchPhrase(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("targetLabel", targetLabel);
+    public void setTargetLabel_MatchPhrase(String targetLabel, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,8 +887,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_MatchPhrasePrefix(targetLabel, null);
     }
 
-    public void setTargetLabel_MatchPhrasePrefix(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("targetLabel", targetLabel);
+    public void setTargetLabel_MatchPhrasePrefix(String targetLabel, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -859,8 +898,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_Fuzzy(targetLabel, null);
     }
 
-    public void setTargetLabel_Fuzzy(String targetLabel, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("targetLabel", targetLabel);
+    public void setTargetLabel_Fuzzy(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -899,12 +938,24 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetLabel_SpanTerm(String targetLabel) {
+        setTargetLabel_SpanTerm("targetLabel", null);
+    }
+
+    public void setTargetLabel_SpanTerm(String targetLabel, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("targetLabel", targetLabel);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetLabel_GreaterThan(String targetLabel) {
         setTargetLabel_GreaterThan(targetLabel, null);
     }
 
     public void setTargetLabel_GreaterThan(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_THAN, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -915,7 +966,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_LessThan(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_THAN, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -926,7 +978,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_GreaterEqual(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_EQUAL, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -937,7 +990,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_LessEqual(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_EQUAL, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1044,8 +1098,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetRole_MatchPhrase(targetRole, null);
     }
 
-    public void setTargetRole_MatchPhrase(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("targetRole", targetRole);
+    public void setTargetRole_MatchPhrase(String targetRole, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1055,8 +1109,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetRole_MatchPhrasePrefix(targetRole, null);
     }
 
-    public void setTargetRole_MatchPhrasePrefix(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("targetRole", targetRole);
+    public void setTargetRole_MatchPhrasePrefix(String targetRole, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1066,8 +1120,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setTargetRole_Fuzzy(targetRole, null);
     }
 
-    public void setTargetRole_Fuzzy(String targetRole, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("targetRole", targetRole);
+    public void setTargetRole_Fuzzy(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1106,12 +1160,24 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetRole_SpanTerm(String targetRole) {
+        setTargetRole_SpanTerm("targetRole", null);
+    }
+
+    public void setTargetRole_SpanTerm(String targetRole, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("targetRole", targetRole);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetRole_GreaterThan(String targetRole) {
         setTargetRole_GreaterThan(targetRole, null);
     }
 
     public void setTargetRole_GreaterThan(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_THAN, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1122,7 +1188,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_LessThan(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_THAN, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1133,7 +1200,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_GreaterEqual(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_EQUAL, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1144,7 +1212,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_LessEqual(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_EQUAL, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1251,8 +1320,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1262,8 +1331,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1273,8 +1342,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1313,12 +1382,24 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1329,7 +1410,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1340,7 +1422,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,7 +1434,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1458,8 +1542,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1469,8 +1553,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1480,8 +1564,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1576,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,7 +1588,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1514,7 +1600,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1525,7 +1612,8 @@ public abstract class BsBadWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
index 541c5a63587c4e47f821b76e111b0f377f26c0b3..f6436b7bb6d6d602cc95cfa1f64eee25ef37bd0d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsBoostDocumentRuleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         BoostDocumentRuleCQ cq = new BoostDocumentRuleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 BoostDocumentRuleCQ cf = new BoostDocumentRuleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setBoostExpr_MatchPhrase(boostExpr, null);
     }
 
-    public void setBoostExpr_MatchPhrase(String boostExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boostExpr", boostExpr);
+    public void setBoostExpr_MatchPhrase(String boostExpr, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boostExpr", boostExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setBoostExpr_MatchPhrasePrefix(boostExpr, null);
     }
 
-    public void setBoostExpr_MatchPhrasePrefix(String boostExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boostExpr", boostExpr);
+    public void setBoostExpr_MatchPhrasePrefix(String boostExpr, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boostExpr", boostExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setBoostExpr_Fuzzy(boostExpr, null);
     }
 
-    public void setBoostExpr_Fuzzy(String boostExpr, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boostExpr", boostExpr);
+    public void setBoostExpr_Fuzzy(String boostExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boostExpr", boostExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBoostExpr_SpanTerm(String boostExpr) {
+        setBoostExpr_SpanTerm("boostExpr", null);
+    }
+
+    public void setBoostExpr_SpanTerm(String boostExpr, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("boostExpr", boostExpr);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBoostExpr_GreaterThan(String boostExpr) {
         setBoostExpr_GreaterThan(boostExpr, null);
     }
 
     public void setBoostExpr_GreaterThan(String boostExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_GREATER_THAN, boostExpr);
+        final Object _value = boostExpr;
+        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoostExpr_LessThan(String boostExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_LESS_THAN, boostExpr);
+        final Object _value = boostExpr;
+        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoostExpr_GreaterEqual(String boostExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_GREATER_EQUAL, boostExpr);
+        final Object _value = boostExpr;
+        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoostExpr_LessEqual(String boostExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_LESS_EQUAL, boostExpr);
+        final Object _value = boostExpr;
+        RangeQueryBuilder builder = regRangeQ("boostExpr", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,12 +540,24 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -536,7 +568,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,7 +580,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -558,7 +592,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -665,8 +700,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,8 +711,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,8 +722,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -699,7 +734,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -710,7 +746,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -721,7 +758,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -732,7 +770,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,8 +878,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,8 +889,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,8 +900,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -873,7 +912,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -884,7 +924,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -895,7 +936,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -906,7 +948,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1013,8 +1056,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1024,8 +1067,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1035,8 +1078,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1075,12 +1118,24 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1091,7 +1146,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1102,7 +1158,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1113,7 +1170,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1220,8 +1278,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1231,8 +1289,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1242,8 +1300,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1254,7 +1312,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1265,7 +1324,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1276,7 +1336,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1287,7 +1348,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1394,8 +1456,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUrlExpr_MatchPhrase(urlExpr, null);
     }
 
-    public void setUrlExpr_MatchPhrase(String urlExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("urlExpr", urlExpr);
+    public void setUrlExpr_MatchPhrase(String urlExpr, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("urlExpr", urlExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1405,8 +1467,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUrlExpr_MatchPhrasePrefix(urlExpr, null);
     }
 
-    public void setUrlExpr_MatchPhrasePrefix(String urlExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("urlExpr", urlExpr);
+    public void setUrlExpr_MatchPhrasePrefix(String urlExpr, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("urlExpr", urlExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1416,8 +1478,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         setUrlExpr_Fuzzy(urlExpr, null);
     }
 
-    public void setUrlExpr_Fuzzy(String urlExpr, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("urlExpr", urlExpr);
+    public void setUrlExpr_Fuzzy(String urlExpr, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("urlExpr", urlExpr);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1456,12 +1518,24 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrlExpr_SpanTerm(String urlExpr) {
+        setUrlExpr_SpanTerm("urlExpr", null);
+    }
+
+    public void setUrlExpr_SpanTerm(String urlExpr, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("urlExpr", urlExpr);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrlExpr_GreaterThan(String urlExpr) {
         setUrlExpr_GreaterThan(urlExpr, null);
     }
 
     public void setUrlExpr_GreaterThan(String urlExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_GREATER_THAN, urlExpr);
+        final Object _value = urlExpr;
+        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1472,7 +1546,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrlExpr_LessThan(String urlExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_LESS_THAN, urlExpr);
+        final Object _value = urlExpr;
+        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1483,7 +1558,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrlExpr_GreaterEqual(String urlExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_GREATER_EQUAL, urlExpr);
+        final Object _value = urlExpr;
+        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1494,7 +1570,8 @@ public abstract class BsBoostDocumentRuleCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrlExpr_LessEqual(String urlExpr, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_LESS_EQUAL, urlExpr);
+        final Object _value = urlExpr;
+        RangeQueryBuilder builder = regRangeQ("urlExpr", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
index d2512560afa6a681f9029c2f686d3d722a749898..a1a7c837b6f977d8dd2fbd8bade4d32d086fa871 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         CrawlingInfoCQ cq = new CrawlingInfoCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 CrawlingInfoCQ cf = new CrawlingInfoCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setExpiredTime_MatchPhrase(expiredTime, null);
     }
 
-    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
+    public void setExpiredTime_MatchPhrase(Long expiredTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setExpiredTime_MatchPhrasePrefix(expiredTime, null);
     }
 
-    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
+    public void setExpiredTime_MatchPhrasePrefix(Long expiredTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setExpiredTime_Fuzzy(expiredTime, null);
     }
 
-    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
+    public void setExpiredTime_Fuzzy(Long expiredTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("expiredTime", expiredTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,7 +467,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_GreaterThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,7 +479,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_LessThan(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,7 +491,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_GreaterEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +503,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setExpiredTime_LessEqual(Long expiredTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, expiredTime);
+        final Object _value = expiredTime;
+        RangeQueryBuilder builder = regRangeQ("expiredTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -598,8 +611,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,8 +622,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,8 +633,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +673,24 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,7 +701,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,7 +713,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,7 +725,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -805,8 +833,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setSessionId_MatchPhrase(sessionId, null);
     }
 
-    public void setSessionId_MatchPhrase(String sessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sessionId", sessionId);
+    public void setSessionId_MatchPhrase(String sessionId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sessionId", sessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,8 +844,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setSessionId_MatchPhrasePrefix(sessionId, null);
     }
 
-    public void setSessionId_MatchPhrasePrefix(String sessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sessionId", sessionId);
+    public void setSessionId_MatchPhrasePrefix(String sessionId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sessionId", sessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,8 +855,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         setSessionId_Fuzzy(sessionId, null);
     }
 
-    public void setSessionId_Fuzzy(String sessionId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sessionId", sessionId);
+    public void setSessionId_Fuzzy(String sessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sessionId", sessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -867,12 +895,24 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSessionId_SpanTerm(String sessionId) {
+        setSessionId_SpanTerm("sessionId", null);
+    }
+
+    public void setSessionId_SpanTerm(String sessionId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("sessionId", sessionId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSessionId_GreaterThan(String sessionId) {
         setSessionId_GreaterThan(sessionId, null);
     }
 
     public void setSessionId_GreaterThan(String sessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_GREATER_THAN, sessionId);
+        final Object _value = sessionId;
+        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -883,7 +923,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setSessionId_LessThan(String sessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_LESS_THAN, sessionId);
+        final Object _value = sessionId;
+        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -894,7 +935,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setSessionId_GreaterEqual(String sessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_GREATER_EQUAL, sessionId);
+        final Object _value = sessionId;
+        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,7 +947,8 @@ public abstract class BsCrawlingInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setSessionId_LessEqual(String sessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_LESS_EQUAL, sessionId);
+        final Object _value = sessionId;
+        RangeQueryBuilder builder = regRangeQ("sessionId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
index 870bb5cdb147f48db4b1cd27de40fae903294862..aca073da35bcaafbed5af5c81559a6b17d0511d5 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsCrawlingInfoParamCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         CrawlingInfoParamCQ cq = new CrawlingInfoParamCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 CrawlingInfoParamCQ cf = new CrawlingInfoParamCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCrawlingInfoId_MatchPhrase(crawlingInfoId, null);
     }
 
-    public void setCrawlingInfoId_MatchPhrase(String crawlingInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("crawlingInfoId", crawlingInfoId);
+    public void setCrawlingInfoId_MatchPhrase(String crawlingInfoId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("crawlingInfoId", crawlingInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCrawlingInfoId_MatchPhrasePrefix(crawlingInfoId, null);
     }
 
-    public void setCrawlingInfoId_MatchPhrasePrefix(String crawlingInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("crawlingInfoId", crawlingInfoId);
+    public void setCrawlingInfoId_MatchPhrasePrefix(String crawlingInfoId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("crawlingInfoId", crawlingInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCrawlingInfoId_Fuzzy(crawlingInfoId, null);
     }
 
-    public void setCrawlingInfoId_Fuzzy(String crawlingInfoId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("crawlingInfoId", crawlingInfoId);
+    public void setCrawlingInfoId_Fuzzy(String crawlingInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("crawlingInfoId", crawlingInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCrawlingInfoId_SpanTerm(String crawlingInfoId) {
+        setCrawlingInfoId_SpanTerm("crawlingInfoId", null);
+    }
+
+    public void setCrawlingInfoId_SpanTerm(String crawlingInfoId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("crawlingInfoId", crawlingInfoId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCrawlingInfoId_GreaterThan(String crawlingInfoId) {
         setCrawlingInfoId_GreaterThan(crawlingInfoId, null);
     }
 
     public void setCrawlingInfoId_GreaterThan(String crawlingInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_THAN, crawlingInfoId);
+        final Object _value = crawlingInfoId;
+        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawlingInfoId_LessThan(String crawlingInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_THAN, crawlingInfoId);
+        final Object _value = crawlingInfoId;
+        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawlingInfoId_GreaterEqual(String crawlingInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_EQUAL, crawlingInfoId);
+        final Object _value = crawlingInfoId;
+        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawlingInfoId_LessEqual(String crawlingInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_EQUAL, crawlingInfoId);
+        final Object _value = crawlingInfoId;
+        RangeQueryBuilder builder = regRangeQ("crawlingInfoId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -492,7 +512,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -503,7 +524,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -514,7 +536,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -525,7 +548,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -632,8 +656,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setKey_MatchPhrase(key, null);
     }
 
-    public void setKey_MatchPhrase(String key, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("key", key);
+    public void setKey_MatchPhrase(String key, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("key", key);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -643,8 +667,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setKey_MatchPhrasePrefix(key, null);
     }
 
-    public void setKey_MatchPhrasePrefix(String key, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("key", key);
+    public void setKey_MatchPhrasePrefix(String key, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("key", key);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -654,8 +678,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setKey_Fuzzy(key, null);
     }
 
-    public void setKey_Fuzzy(String key, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("key", key);
+    public void setKey_Fuzzy(String key, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("key", key);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -694,12 +718,24 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setKey_SpanTerm(String key) {
+        setKey_SpanTerm("key", null);
+    }
+
+    public void setKey_SpanTerm(String key, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("key", key);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setKey_GreaterThan(String key) {
         setKey_GreaterThan(key, null);
     }
 
     public void setKey_GreaterThan(String key, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_GREATER_THAN, key);
+        final Object _value = key;
+        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -710,7 +746,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setKey_LessThan(String key, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_LESS_THAN, key);
+        final Object _value = key;
+        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -721,7 +758,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setKey_GreaterEqual(String key, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_GREATER_EQUAL, key);
+        final Object _value = key;
+        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -732,7 +770,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setKey_LessEqual(String key, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_LESS_EQUAL, key);
+        final Object _value = key;
+        RangeQueryBuilder builder = regRangeQ("key", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,8 +878,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrase(value, null);
     }
 
-    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("value", value);
+    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,8 +889,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrasePrefix(value, null);
     }
 
-    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
+    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,8 +900,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         setValue_Fuzzy(value, null);
     }
 
-    public void setValue_Fuzzy(String value, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("value", value);
+    public void setValue_Fuzzy(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -901,12 +940,24 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_SpanTerm(String value) {
+        setValue_SpanTerm("value", null);
+    }
+
+    public void setValue_SpanTerm(String value, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("value", value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_GreaterThan(String value) {
         setValue_GreaterThan(value, null);
     }
 
     public void setValue_GreaterThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -917,7 +968,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -928,7 +980,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,7 +992,8 @@ public abstract class BsCrawlingInfoParamCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
index 695194167270559090d5be66a884b9fbecea7e1d..7ed51221c8f1e5b12dfc712255fae3999758808a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         DataConfigCQ cq = new DataConfigCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 DataConfigCQ cf = new DataConfigCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrase(available, null);
     }
 
-    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("available", available);
+    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrasePrefix(available, null);
     }
 
-    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
+    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setAvailable_Fuzzy(available, null);
     }
 
-    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("available", available);
+    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrase(boost, null);
     }
 
-    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boost", boost);
+    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrasePrefix(boost, null);
     }
 
-    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
+    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setBoost_Fuzzy(boost, null);
     }
 
-    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boost", boost);
+    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,7 +467,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,7 +479,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,7 +491,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +503,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -598,8 +611,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,8 +622,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,8 +633,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +673,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,7 +701,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,7 +713,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,7 +725,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -805,8 +833,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,8 +844,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,8 +855,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,7 +867,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,7 +879,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,7 +891,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -872,7 +903,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -979,8 +1011,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerName_MatchPhrase(handlerName, null);
     }
 
-    public void setHandlerName_MatchPhrase(String handlerName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("handlerName", handlerName);
+    public void setHandlerName_MatchPhrase(String handlerName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("handlerName", handlerName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -990,8 +1022,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerName_MatchPhrasePrefix(handlerName, null);
     }
 
-    public void setHandlerName_MatchPhrasePrefix(String handlerName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("handlerName", handlerName);
+    public void setHandlerName_MatchPhrasePrefix(String handlerName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("handlerName", handlerName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1001,8 +1033,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerName_Fuzzy(handlerName, null);
     }
 
-    public void setHandlerName_Fuzzy(String handlerName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("handlerName", handlerName);
+    public void setHandlerName_Fuzzy(String handlerName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("handlerName", handlerName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1041,12 +1073,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerName_SpanTerm(String handlerName) {
+        setHandlerName_SpanTerm("handlerName", null);
+    }
+
+    public void setHandlerName_SpanTerm(String handlerName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("handlerName", handlerName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerName_GreaterThan(String handlerName) {
         setHandlerName_GreaterThan(handlerName, null);
     }
 
     public void setHandlerName_GreaterThan(String handlerName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_GREATER_THAN, handlerName);
+        final Object _value = handlerName;
+        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,7 +1101,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerName_LessThan(String handlerName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_LESS_THAN, handlerName);
+        final Object _value = handlerName;
+        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1068,7 +1113,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerName_GreaterEqual(String handlerName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_GREATER_EQUAL, handlerName);
+        final Object _value = handlerName;
+        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1125,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerName_LessEqual(String handlerName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_LESS_EQUAL, handlerName);
+        final Object _value = handlerName;
+        RangeQueryBuilder builder = regRangeQ("handlerName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1186,8 +1233,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerParameter_MatchPhrase(handlerParameter, null);
     }
 
-    public void setHandlerParameter_MatchPhrase(String handlerParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("handlerParameter", handlerParameter);
+    public void setHandlerParameter_MatchPhrase(String handlerParameter, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("handlerParameter", handlerParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1197,8 +1244,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerParameter_MatchPhrasePrefix(handlerParameter, null);
     }
 
-    public void setHandlerParameter_MatchPhrasePrefix(String handlerParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("handlerParameter", handlerParameter);
+    public void setHandlerParameter_MatchPhrasePrefix(String handlerParameter, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("handlerParameter", handlerParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1208,8 +1255,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerParameter_Fuzzy(handlerParameter, null);
     }
 
-    public void setHandlerParameter_Fuzzy(String handlerParameter, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("handlerParameter", handlerParameter);
+    public void setHandlerParameter_Fuzzy(String handlerParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("handlerParameter", handlerParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1248,12 +1295,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerParameter_SpanTerm(String handlerParameter) {
+        setHandlerParameter_SpanTerm("handlerParameter", null);
+    }
+
+    public void setHandlerParameter_SpanTerm(String handlerParameter, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("handlerParameter", handlerParameter);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerParameter_GreaterThan(String handlerParameter) {
         setHandlerParameter_GreaterThan(handlerParameter, null);
     }
 
     public void setHandlerParameter_GreaterThan(String handlerParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_GREATER_THAN, handlerParameter);
+        final Object _value = handlerParameter;
+        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1264,7 +1323,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerParameter_LessThan(String handlerParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_LESS_THAN, handlerParameter);
+        final Object _value = handlerParameter;
+        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1275,7 +1335,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerParameter_GreaterEqual(String handlerParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_GREATER_EQUAL, handlerParameter);
+        final Object _value = handlerParameter;
+        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1286,7 +1347,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerParameter_LessEqual(String handlerParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_LESS_EQUAL, handlerParameter);
+        final Object _value = handlerParameter;
+        RangeQueryBuilder builder = regRangeQ("handlerParameter", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1393,8 +1455,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerScript_MatchPhrase(handlerScript, null);
     }
 
-    public void setHandlerScript_MatchPhrase(String handlerScript, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("handlerScript", handlerScript);
+    public void setHandlerScript_MatchPhrase(String handlerScript, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("handlerScript", handlerScript);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1404,8 +1466,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerScript_MatchPhrasePrefix(handlerScript, null);
     }
 
-    public void setHandlerScript_MatchPhrasePrefix(String handlerScript, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("handlerScript", handlerScript);
+    public void setHandlerScript_MatchPhrasePrefix(String handlerScript, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("handlerScript", handlerScript);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1415,8 +1477,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setHandlerScript_Fuzzy(handlerScript, null);
     }
 
-    public void setHandlerScript_Fuzzy(String handlerScript, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("handlerScript", handlerScript);
+    public void setHandlerScript_Fuzzy(String handlerScript, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("handlerScript", handlerScript);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1455,12 +1517,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHandlerScript_SpanTerm(String handlerScript) {
+        setHandlerScript_SpanTerm("handlerScript", null);
+    }
+
+    public void setHandlerScript_SpanTerm(String handlerScript, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("handlerScript", handlerScript);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHandlerScript_GreaterThan(String handlerScript) {
         setHandlerScript_GreaterThan(handlerScript, null);
     }
 
     public void setHandlerScript_GreaterThan(String handlerScript, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_GREATER_THAN, handlerScript);
+        final Object _value = handlerScript;
+        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1471,7 +1545,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerScript_LessThan(String handlerScript, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_LESS_THAN, handlerScript);
+        final Object _value = handlerScript;
+        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,7 +1557,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerScript_GreaterEqual(String handlerScript, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_GREATER_EQUAL, handlerScript);
+        final Object _value = handlerScript;
+        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1493,7 +1569,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setHandlerScript_LessEqual(String handlerScript, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_LESS_EQUAL, handlerScript);
+        final Object _value = handlerScript;
+        RangeQueryBuilder builder = regRangeQ("handlerScript", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1600,8 +1677,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1611,8 +1688,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1622,8 +1699,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1662,12 +1739,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1678,7 +1767,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1689,7 +1779,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1700,7 +1791,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1807,8 +1899,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1818,8 +1910,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1829,8 +1921,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1869,12 +1961,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1885,7 +1989,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1896,7 +2001,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1907,7 +2013,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2014,8 +2121,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2025,8 +2132,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2036,8 +2143,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2048,7 +2155,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2059,7 +2167,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,7 +2179,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2081,7 +2191,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2188,8 +2299,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2199,8 +2310,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2210,8 +2321,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2250,12 +2361,24 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2266,7 +2389,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2277,7 +2401,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2288,7 +2413,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2395,8 +2521,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2406,8 +2532,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2417,8 +2543,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2429,7 +2555,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2440,7 +2567,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2451,7 +2579,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2462,7 +2591,8 @@ public abstract class BsDataConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
index e7b0902c43d36424f42f3738917b60c725f6439d..e62a4a6de414b1543608715f2f58adcee92fef36 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToLabelCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         DataConfigToLabelCQ cq = new DataConfigToLabelCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 DataConfigToLabelCQ cf = new DataConfigToLabelCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setDataConfigId_MatchPhrase(dataConfigId, null);
     }
 
-    public void setDataConfigId_MatchPhrase(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_MatchPhrase(String dataConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setDataConfigId_MatchPhrasePrefix(dataConfigId, null);
     }
 
-    public void setDataConfigId_MatchPhrasePrefix(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_MatchPhrasePrefix(String dataConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setDataConfigId_Fuzzy(dataConfigId, null);
     }
 
-    public void setDataConfigId_Fuzzy(String dataConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_Fuzzy(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDataConfigId_SpanTerm(String dataConfigId) {
+        setDataConfigId_SpanTerm("dataConfigId", null);
+    }
+
+    public void setDataConfigId_SpanTerm(String dataConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("dataConfigId", dataConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDataConfigId_GreaterThan(String dataConfigId) {
         setDataConfigId_GreaterThan(dataConfigId, null);
     }
 
     public void setDataConfigId_GreaterThan(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_THAN, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_LessThan(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_THAN, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_GreaterEqual(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_EQUAL, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_LessEqual(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_EQUAL, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrase(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrasePrefix(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_Fuzzy(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,12 +540,24 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_SpanTerm(String labelTypeId) {
+        setLabelTypeId_SpanTerm("labelTypeId", null);
+    }
+
+    public void setLabelTypeId_SpanTerm(String labelTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labelTypeId", labelTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_GreaterThan(String labelTypeId) {
         setLabelTypeId_GreaterThan(labelTypeId, null);
     }
 
     public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -536,7 +568,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,7 +580,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -558,7 +592,8 @@ public abstract class BsDataConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
index 42c1e06d0c58edb386c67f92a24be2a23a3497d5..f97cb0da1c1e1626c51f83bf5c7ec3aee2c71832 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDataConfigToRoleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         DataConfigToRoleCQ cq = new DataConfigToRoleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 DataConfigToRoleCQ cf = new DataConfigToRoleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setDataConfigId_MatchPhrase(dataConfigId, null);
     }
 
-    public void setDataConfigId_MatchPhrase(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_MatchPhrase(String dataConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setDataConfigId_MatchPhrasePrefix(dataConfigId, null);
     }
 
-    public void setDataConfigId_MatchPhrasePrefix(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_MatchPhrasePrefix(String dataConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setDataConfigId_Fuzzy(dataConfigId, null);
     }
 
-    public void setDataConfigId_Fuzzy(String dataConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("dataConfigId", dataConfigId);
+    public void setDataConfigId_Fuzzy(String dataConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("dataConfigId", dataConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDataConfigId_SpanTerm(String dataConfigId) {
+        setDataConfigId_SpanTerm("dataConfigId", null);
+    }
+
+    public void setDataConfigId_SpanTerm(String dataConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("dataConfigId", dataConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDataConfigId_GreaterThan(String dataConfigId) {
         setDataConfigId_GreaterThan(dataConfigId, null);
     }
 
     public void setDataConfigId_GreaterThan(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_THAN, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_LessThan(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_THAN, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_GreaterEqual(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_EQUAL, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setDataConfigId_LessEqual(String dataConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_EQUAL, dataConfigId);
+        final Object _value = dataConfigId;
+        RangeQueryBuilder builder = regRangeQ("dataConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrase(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrasePrefix(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_Fuzzy(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_SpanTerm(String roleTypeId) {
+        setRoleTypeId_SpanTerm("roleTypeId", null);
+    }
+
+    public void setRoleTypeId_SpanTerm(String roleTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roleTypeId", roleTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_GreaterThan(String roleTypeId) {
         setRoleTypeId_GreaterThan(roleTypeId, null);
     }
 
     public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsDataConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
index f0ae5594e172394cc5bb17aa2d2007868b15b014..5e0219033b66d43820b9e4ecec4307067796120f 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsDuplicateHostCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         DuplicateHostCQ cq = new DuplicateHostCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 DuplicateHostCQ cf = new DuplicateHostCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +511,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setDuplicateHostName_MatchPhrase(duplicateHostName, null);
     }
 
-    public void setDuplicateHostName_MatchPhrase(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("duplicateHostName", duplicateHostName);
+    public void setDuplicateHostName_MatchPhrase(String duplicateHostName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setDuplicateHostName_MatchPhrasePrefix(duplicateHostName, null);
     }
 
-    public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("duplicateHostName", duplicateHostName);
+    public void setDuplicateHostName_MatchPhrasePrefix(String duplicateHostName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setDuplicateHostName_Fuzzy(duplicateHostName, null);
     }
 
-    public void setDuplicateHostName_Fuzzy(String duplicateHostName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("duplicateHostName", duplicateHostName);
+    public void setDuplicateHostName_Fuzzy(String duplicateHostName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("duplicateHostName", duplicateHostName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDuplicateHostName_SpanTerm(String duplicateHostName) {
+        setDuplicateHostName_SpanTerm("duplicateHostName", null);
+    }
+
+    public void setDuplicateHostName_SpanTerm(String duplicateHostName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("duplicateHostName", duplicateHostName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDuplicateHostName_GreaterThan(String duplicateHostName) {
         setDuplicateHostName_GreaterThan(duplicateHostName, null);
     }
 
     public void setDuplicateHostName_GreaterThan(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_THAN, duplicateHostName);
+        final Object _value = duplicateHostName;
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setDuplicateHostName_LessThan(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_THAN, duplicateHostName);
+        final Object _value = duplicateHostName;
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setDuplicateHostName_GreaterEqual(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_EQUAL, duplicateHostName);
+        final Object _value = duplicateHostName;
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setDuplicateHostName_LessEqual(String duplicateHostName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_EQUAL, duplicateHostName);
+        final Object _value = duplicateHostName;
+        RangeQueryBuilder builder = regRangeQ("duplicateHostName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setRegularName_MatchPhrase(regularName, null);
     }
 
-    public void setRegularName_MatchPhrase(String regularName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("regularName", regularName);
+    public void setRegularName_MatchPhrase(String regularName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("regularName", regularName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setRegularName_MatchPhrasePrefix(regularName, null);
     }
 
-    public void setRegularName_MatchPhrasePrefix(String regularName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("regularName", regularName);
+    public void setRegularName_MatchPhrasePrefix(String regularName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("regularName", regularName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setRegularName_Fuzzy(regularName, null);
     }
 
-    public void setRegularName_Fuzzy(String regularName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("regularName", regularName);
+    public void setRegularName_Fuzzy(String regularName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("regularName", regularName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRegularName_SpanTerm(String regularName) {
+        setRegularName_SpanTerm("regularName", null);
+    }
+
+    public void setRegularName_SpanTerm(String regularName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("regularName", regularName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRegularName_GreaterThan(String regularName) {
         setRegularName_GreaterThan(regularName, null);
     }
 
     public void setRegularName_GreaterThan(String regularName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_GREATER_THAN, regularName);
+        final Object _value = regularName;
+        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegularName_LessThan(String regularName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_LESS_THAN, regularName);
+        final Object _value = regularName;
+        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegularName_GreaterEqual(String regularName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_GREATER_EQUAL, regularName);
+        final Object _value = regularName;
+        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegularName_LessEqual(String regularName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_LESS_EQUAL, regularName);
+        final Object _value = regularName;
+        RangeQueryBuilder builder = regRangeQ("regularName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1133,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1090,7 +1145,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,7 +1157,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,7 +1169,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,8 +1277,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,8 +1288,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,8 +1299,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1281,12 +1339,24 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,7 +1367,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1308,7 +1379,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1319,7 +1391,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1426,8 +1499,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,8 +1510,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,8 +1521,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1460,7 +1533,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1471,7 +1545,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,7 +1557,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1493,7 +1569,8 @@ public abstract class BsDuplicateHostCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
index f449219be9035cfa670b68ee08261b69c670e669..66f75c908d444590e119926c5d5c25959520fb82 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         ElevateWordCQ cq = new ElevateWordCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 ElevateWordCQ cf = new ElevateWordCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrase(boost, null);
     }
 
-    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boost", boost);
+    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrasePrefix(boost, null);
     }
 
-    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
+    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setBoost_Fuzzy(boost, null);
     }
 
-    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boost", boost);
+    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -486,12 +495,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -665,7 +689,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,7 +701,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,7 +713,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,7 +725,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -805,8 +833,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setReading_MatchPhrase(reading, null);
     }
 
-    public void setReading_MatchPhrase(String reading, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("reading", reading);
+    public void setReading_MatchPhrase(String reading, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("reading", reading);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,8 +844,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setReading_MatchPhrasePrefix(reading, null);
     }
 
-    public void setReading_MatchPhrasePrefix(String reading, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("reading", reading);
+    public void setReading_MatchPhrasePrefix(String reading, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("reading", reading);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,8 +855,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setReading_Fuzzy(reading, null);
     }
 
-    public void setReading_Fuzzy(String reading, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("reading", reading);
+    public void setReading_Fuzzy(String reading, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("reading", reading);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -867,12 +895,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setReading_SpanTerm(String reading) {
+        setReading_SpanTerm("reading", null);
+    }
+
+    public void setReading_SpanTerm(String reading, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("reading", reading);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setReading_GreaterThan(String reading) {
         setReading_GreaterThan(reading, null);
     }
 
     public void setReading_GreaterThan(String reading, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_GREATER_THAN, reading);
+        final Object _value = reading;
+        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -883,7 +923,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setReading_LessThan(String reading, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_LESS_THAN, reading);
+        final Object _value = reading;
+        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -894,7 +935,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setReading_GreaterEqual(String reading, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_GREATER_EQUAL, reading);
+        final Object _value = reading;
+        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,7 +947,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setReading_LessEqual(String reading, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_LESS_EQUAL, reading);
+        final Object _value = reading;
+        RangeQueryBuilder builder = regRangeQ("reading", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1012,8 +1055,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_MatchPhrase(suggestWord, null);
     }
 
-    public void setSuggestWord_MatchPhrase(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("suggestWord", suggestWord);
+    public void setSuggestWord_MatchPhrase(String suggestWord, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1023,8 +1066,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_MatchPhrasePrefix(suggestWord, null);
     }
 
-    public void setSuggestWord_MatchPhrasePrefix(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("suggestWord", suggestWord);
+    public void setSuggestWord_MatchPhrasePrefix(String suggestWord, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1034,8 +1077,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setSuggestWord_Fuzzy(suggestWord, null);
     }
 
-    public void setSuggestWord_Fuzzy(String suggestWord, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("suggestWord", suggestWord);
+    public void setSuggestWord_Fuzzy(String suggestWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("suggestWord", suggestWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1074,12 +1117,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSuggestWord_SpanTerm(String suggestWord) {
+        setSuggestWord_SpanTerm("suggestWord", null);
+    }
+
+    public void setSuggestWord_SpanTerm(String suggestWord, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("suggestWord", suggestWord);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSuggestWord_GreaterThan(String suggestWord) {
         setSuggestWord_GreaterThan(suggestWord, null);
     }
 
     public void setSuggestWord_GreaterThan(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_THAN, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1090,7 +1145,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_LessThan(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_THAN, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,7 +1157,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_GreaterEqual(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_EQUAL, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,7 +1169,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setSuggestWord_LessEqual(String suggestWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_EQUAL, suggestWord);
+        final Object _value = suggestWord;
+        RangeQueryBuilder builder = regRangeQ("suggestWord", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,8 +1277,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_MatchPhrase(targetLabel, null);
     }
 
-    public void setTargetLabel_MatchPhrase(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("targetLabel", targetLabel);
+    public void setTargetLabel_MatchPhrase(String targetLabel, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,8 +1288,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_MatchPhrasePrefix(targetLabel, null);
     }
 
-    public void setTargetLabel_MatchPhrasePrefix(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("targetLabel", targetLabel);
+    public void setTargetLabel_MatchPhrasePrefix(String targetLabel, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,8 +1299,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetLabel_Fuzzy(targetLabel, null);
     }
 
-    public void setTargetLabel_Fuzzy(String targetLabel, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("targetLabel", targetLabel);
+    public void setTargetLabel_Fuzzy(String targetLabel, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("targetLabel", targetLabel);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1281,12 +1339,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetLabel_SpanTerm(String targetLabel) {
+        setTargetLabel_SpanTerm("targetLabel", null);
+    }
+
+    public void setTargetLabel_SpanTerm(String targetLabel, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("targetLabel", targetLabel);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetLabel_GreaterThan(String targetLabel) {
         setTargetLabel_GreaterThan(targetLabel, null);
     }
 
     public void setTargetLabel_GreaterThan(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_THAN, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,7 +1367,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_LessThan(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_THAN, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1308,7 +1379,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_GreaterEqual(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_EQUAL, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1319,7 +1391,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetLabel_LessEqual(String targetLabel, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_EQUAL, targetLabel);
+        final Object _value = targetLabel;
+        RangeQueryBuilder builder = regRangeQ("targetLabel", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1426,8 +1499,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetRole_MatchPhrase(targetRole, null);
     }
 
-    public void setTargetRole_MatchPhrase(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("targetRole", targetRole);
+    public void setTargetRole_MatchPhrase(String targetRole, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,8 +1510,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetRole_MatchPhrasePrefix(targetRole, null);
     }
 
-    public void setTargetRole_MatchPhrasePrefix(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("targetRole", targetRole);
+    public void setTargetRole_MatchPhrasePrefix(String targetRole, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,8 +1521,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setTargetRole_Fuzzy(targetRole, null);
     }
 
-    public void setTargetRole_Fuzzy(String targetRole, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("targetRole", targetRole);
+    public void setTargetRole_Fuzzy(String targetRole, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("targetRole", targetRole);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1488,12 +1561,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTargetRole_SpanTerm(String targetRole) {
+        setTargetRole_SpanTerm("targetRole", null);
+    }
+
+    public void setTargetRole_SpanTerm(String targetRole, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("targetRole", targetRole);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTargetRole_GreaterThan(String targetRole) {
         setTargetRole_GreaterThan(targetRole, null);
     }
 
     public void setTargetRole_GreaterThan(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_THAN, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1504,7 +1589,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_LessThan(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_THAN, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,7 +1601,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_GreaterEqual(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_EQUAL, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,7 +1613,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setTargetRole_LessEqual(String targetRole, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_EQUAL, targetRole);
+        final Object _value = targetRole;
+        RangeQueryBuilder builder = regRangeQ("targetRole", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1633,8 +1721,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1644,8 +1732,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,8 +1743,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1695,12 +1783,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1711,7 +1811,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1722,7 +1823,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1733,7 +1835,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1840,8 +1943,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1851,8 +1954,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1862,8 +1965,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1902,12 +2005,24 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1918,7 +2033,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1929,7 +2045,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1940,7 +2057,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2047,8 +2165,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2058,8 +2176,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2069,8 +2187,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2081,7 +2199,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2092,7 +2211,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2103,7 +2223,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2114,7 +2235,8 @@ public abstract class BsElevateWordCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
index 3a5e0302cb35c95965ca62aa4e089680469893e1..8770352595ca87c1a33a96234e0c567cee4661f8 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsElevateWordToLabelCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         ElevateWordToLabelCQ cq = new ElevateWordToLabelCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 ElevateWordToLabelCQ cf = new ElevateWordToLabelCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setElevateWordId_MatchPhrase(elevateWordId, null);
     }
 
-    public void setElevateWordId_MatchPhrase(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("elevateWordId", elevateWordId);
+    public void setElevateWordId_MatchPhrase(String elevateWordId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setElevateWordId_MatchPhrasePrefix(elevateWordId, null);
     }
 
-    public void setElevateWordId_MatchPhrasePrefix(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("elevateWordId", elevateWordId);
+    public void setElevateWordId_MatchPhrasePrefix(String elevateWordId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setElevateWordId_Fuzzy(elevateWordId, null);
     }
 
-    public void setElevateWordId_Fuzzy(String elevateWordId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("elevateWordId", elevateWordId);
+    public void setElevateWordId_Fuzzy(String elevateWordId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("elevateWordId", elevateWordId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setElevateWordId_SpanTerm(String elevateWordId) {
+        setElevateWordId_SpanTerm("elevateWordId", null);
+    }
+
+    public void setElevateWordId_SpanTerm(String elevateWordId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("elevateWordId", elevateWordId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setElevateWordId_GreaterThan(String elevateWordId) {
         setElevateWordId_GreaterThan(elevateWordId, null);
     }
 
     public void setElevateWordId_GreaterThan(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_THAN, elevateWordId);
+        final Object _value = elevateWordId;
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setElevateWordId_LessThan(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_THAN, elevateWordId);
+        final Object _value = elevateWordId;
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setElevateWordId_GreaterEqual(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_EQUAL, elevateWordId);
+        final Object _value = elevateWordId;
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setElevateWordId_LessEqual(String elevateWordId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_EQUAL, elevateWordId);
+        final Object _value = elevateWordId;
+        RangeQueryBuilder builder = regRangeQ("elevateWordId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrase(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrasePrefix(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_Fuzzy(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,12 +540,24 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_SpanTerm(String labelTypeId) {
+        setLabelTypeId_SpanTerm("labelTypeId", null);
+    }
+
+    public void setLabelTypeId_SpanTerm(String labelTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labelTypeId", labelTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_GreaterThan(String labelTypeId) {
         setLabelTypeId_GreaterThan(labelTypeId, null);
     }
 
     public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -536,7 +568,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,7 +580,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -558,7 +592,8 @@ public abstract class BsElevateWordToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
index 0338293ee700b81259589b59330fb4f06c03d22b..3df830dbb4316da169fad414fffc4097a42e2855 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFailureUrlCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FailureUrlCQ cq = new FailureUrlCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FailureUrlCQ cf = new FailureUrlCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setConfigId_MatchPhrase(configId, null);
     }
 
-    public void setConfigId_MatchPhrase(String configId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("configId", configId);
+    public void setConfigId_MatchPhrase(String configId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("configId", configId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setConfigId_MatchPhrasePrefix(configId, null);
     }
 
-    public void setConfigId_MatchPhrasePrefix(String configId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("configId", configId);
+    public void setConfigId_MatchPhrasePrefix(String configId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("configId", configId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setConfigId_Fuzzy(configId, null);
     }
 
-    public void setConfigId_Fuzzy(String configId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("configId", configId);
+    public void setConfigId_Fuzzy(String configId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("configId", configId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigId_SpanTerm(String configId) {
+        setConfigId_SpanTerm("configId", null);
+    }
+
+    public void setConfigId_SpanTerm(String configId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("configId", configId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigId_GreaterThan(String configId) {
         setConfigId_GreaterThan(configId, null);
     }
 
     public void setConfigId_GreaterThan(String configId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_GREATER_THAN, configId);
+        final Object _value = configId;
+        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigId_LessThan(String configId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_LESS_THAN, configId);
+        final Object _value = configId;
+        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigId_GreaterEqual(String configId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_GREATER_EQUAL, configId);
+        final Object _value = configId;
+        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigId_LessEqual(String configId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_LESS_EQUAL, configId);
+        final Object _value = configId;
+        RangeQueryBuilder builder = regRangeQ("configId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorCount_MatchPhrase(errorCount, null);
     }
 
-    public void setErrorCount_MatchPhrase(Integer errorCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("errorCount", errorCount);
+    public void setErrorCount_MatchPhrase(Integer errorCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("errorCount", errorCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorCount_MatchPhrasePrefix(errorCount, null);
     }
 
-    public void setErrorCount_MatchPhrasePrefix(Integer errorCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("errorCount", errorCount);
+    public void setErrorCount_MatchPhrasePrefix(Integer errorCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("errorCount", errorCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorCount_Fuzzy(errorCount, null);
     }
 
-    public void setErrorCount_Fuzzy(Integer errorCount, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("errorCount", errorCount);
+    public void setErrorCount_Fuzzy(Integer errorCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("errorCount", errorCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +511,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorCount_GreaterThan(Integer errorCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_GREATER_THAN, errorCount);
+        final Object _value = errorCount;
+        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorCount_LessThan(Integer errorCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_LESS_THAN, errorCount);
+        final Object _value = errorCount;
+        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorCount_GreaterEqual(Integer errorCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_GREATER_EQUAL, errorCount);
+        final Object _value = errorCount;
+        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorCount_LessEqual(Integer errorCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_LESS_EQUAL, errorCount);
+        final Object _value = errorCount;
+        RangeQueryBuilder builder = regRangeQ("errorCount", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorLog_MatchPhrase(errorLog, null);
     }
 
-    public void setErrorLog_MatchPhrase(String errorLog, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("errorLog", errorLog);
+    public void setErrorLog_MatchPhrase(String errorLog, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("errorLog", errorLog);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorLog_MatchPhrasePrefix(errorLog, null);
     }
 
-    public void setErrorLog_MatchPhrasePrefix(String errorLog, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("errorLog", errorLog);
+    public void setErrorLog_MatchPhrasePrefix(String errorLog, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("errorLog", errorLog);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorLog_Fuzzy(errorLog, null);
     }
 
-    public void setErrorLog_Fuzzy(String errorLog, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("errorLog", errorLog);
+    public void setErrorLog_Fuzzy(String errorLog, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("errorLog", errorLog);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setErrorLog_SpanTerm(String errorLog) {
+        setErrorLog_SpanTerm("errorLog", null);
+    }
+
+    public void setErrorLog_SpanTerm(String errorLog, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("errorLog", errorLog);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setErrorLog_GreaterThan(String errorLog) {
         setErrorLog_GreaterThan(errorLog, null);
     }
 
     public void setErrorLog_GreaterThan(String errorLog, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_GREATER_THAN, errorLog);
+        final Object _value = errorLog;
+        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorLog_LessThan(String errorLog, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_LESS_THAN, errorLog);
+        final Object _value = errorLog;
+        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorLog_GreaterEqual(String errorLog, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_GREATER_EQUAL, errorLog);
+        final Object _value = errorLog;
+        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorLog_LessEqual(String errorLog, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_LESS_EQUAL, errorLog);
+        final Object _value = errorLog;
+        RangeQueryBuilder builder = regRangeQ("errorLog", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorName_MatchPhrase(errorName, null);
     }
 
-    public void setErrorName_MatchPhrase(String errorName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("errorName", errorName);
+    public void setErrorName_MatchPhrase(String errorName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("errorName", errorName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorName_MatchPhrasePrefix(errorName, null);
     }
 
-    public void setErrorName_MatchPhrasePrefix(String errorName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("errorName", errorName);
+    public void setErrorName_MatchPhrasePrefix(String errorName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("errorName", errorName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setErrorName_Fuzzy(errorName, null);
     }
 
-    public void setErrorName_Fuzzy(String errorName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("errorName", errorName);
+    public void setErrorName_Fuzzy(String errorName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("errorName", errorName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setErrorName_SpanTerm(String errorName) {
+        setErrorName_SpanTerm("errorName", null);
+    }
+
+    public void setErrorName_SpanTerm(String errorName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("errorName", errorName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setErrorName_GreaterThan(String errorName) {
         setErrorName_GreaterThan(errorName, null);
     }
 
     public void setErrorName_GreaterThan(String errorName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_GREATER_THAN, errorName);
+        final Object _value = errorName;
+        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorName_LessThan(String errorName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_LESS_THAN, errorName);
+        final Object _value = errorName;
+        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorName_GreaterEqual(String errorName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_GREATER_EQUAL, errorName);
+        final Object _value = errorName;
+        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setErrorName_LessEqual(String errorName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_LESS_EQUAL, errorName);
+        final Object _value = errorName;
+        RangeQueryBuilder builder = regRangeQ("errorName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setLastAccessTime_MatchPhrase(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_MatchPhrase(Long lastAccessTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("lastAccessTime", lastAccessTime);
+    public void setLastAccessTime_MatchPhrase(Long lastAccessTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("lastAccessTime", lastAccessTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setLastAccessTime_MatchPhrasePrefix(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_MatchPhrasePrefix(Long lastAccessTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("lastAccessTime", lastAccessTime);
+    public void setLastAccessTime_MatchPhrasePrefix(Long lastAccessTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("lastAccessTime", lastAccessTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setLastAccessTime_Fuzzy(lastAccessTime, null);
     }
 
-    public void setLastAccessTime_Fuzzy(Long lastAccessTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("lastAccessTime", lastAccessTime);
+    public void setLastAccessTime_Fuzzy(Long lastAccessTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("lastAccessTime", lastAccessTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1133,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastAccessTime_GreaterThan(Long lastAccessTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_GREATER_THAN, lastAccessTime);
+        final Object _value = lastAccessTime;
+        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1090,7 +1145,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastAccessTime_LessThan(Long lastAccessTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_LESS_THAN, lastAccessTime);
+        final Object _value = lastAccessTime;
+        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,7 +1157,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastAccessTime_GreaterEqual(Long lastAccessTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_GREATER_EQUAL, lastAccessTime);
+        final Object _value = lastAccessTime;
+        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,7 +1169,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastAccessTime_LessEqual(Long lastAccessTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_LESS_EQUAL, lastAccessTime);
+        final Object _value = lastAccessTime;
+        RangeQueryBuilder builder = regRangeQ("lastAccessTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,8 +1277,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setThreadName_MatchPhrase(threadName, null);
     }
 
-    public void setThreadName_MatchPhrase(String threadName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("threadName", threadName);
+    public void setThreadName_MatchPhrase(String threadName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("threadName", threadName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,8 +1288,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setThreadName_MatchPhrasePrefix(threadName, null);
     }
 
-    public void setThreadName_MatchPhrasePrefix(String threadName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("threadName", threadName);
+    public void setThreadName_MatchPhrasePrefix(String threadName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("threadName", threadName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,8 +1299,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setThreadName_Fuzzy(threadName, null);
     }
 
-    public void setThreadName_Fuzzy(String threadName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("threadName", threadName);
+    public void setThreadName_Fuzzy(String threadName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("threadName", threadName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1281,12 +1339,24 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setThreadName_SpanTerm(String threadName) {
+        setThreadName_SpanTerm("threadName", null);
+    }
+
+    public void setThreadName_SpanTerm(String threadName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("threadName", threadName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setThreadName_GreaterThan(String threadName) {
         setThreadName_GreaterThan(threadName, null);
     }
 
     public void setThreadName_GreaterThan(String threadName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_GREATER_THAN, threadName);
+        final Object _value = threadName;
+        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,7 +1367,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setThreadName_LessThan(String threadName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_LESS_THAN, threadName);
+        final Object _value = threadName;
+        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1308,7 +1379,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setThreadName_GreaterEqual(String threadName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_GREATER_EQUAL, threadName);
+        final Object _value = threadName;
+        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1319,7 +1391,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setThreadName_LessEqual(String threadName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_LESS_EQUAL, threadName);
+        final Object _value = threadName;
+        RangeQueryBuilder builder = regRangeQ("threadName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1426,8 +1499,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrase(url, null);
     }
 
-    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("url", url);
+    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,8 +1510,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrasePrefix(url, null);
     }
 
-    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
+    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,8 +1521,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         setUrl_Fuzzy(url, null);
     }
 
-    public void setUrl_Fuzzy(String url, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("url", url);
+    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1488,12 +1561,24 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_SpanTerm(String url) {
+        setUrl_SpanTerm("url", null);
+    }
+
+    public void setUrl_SpanTerm(String url, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_GreaterThan(String url) {
         setUrl_GreaterThan(url, null);
     }
 
     public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1504,7 +1589,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,7 +1601,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,7 +1613,8 @@ public abstract class BsFailureUrlCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
index c433b8ef7eb36a3cc031ab4476558212154a1f6a..cfd775f331add62f24b9889b6e62df3fd29e0d1a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileAuthenticationCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FileAuthenticationCQ cq = new FileAuthenticationCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FileAuthenticationCQ cf = new FileAuthenticationCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -492,7 +512,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -503,7 +524,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -514,7 +536,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -525,7 +548,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -632,8 +656,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrase(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -643,8 +667,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrasePrefix(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -654,8 +678,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setFileConfigId_Fuzzy(fileConfigId, null);
     }
 
-    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -694,12 +718,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_SpanTerm(String fileConfigId) {
+        setFileConfigId_SpanTerm("fileConfigId", null);
+    }
+
+    public void setFileConfigId_SpanTerm(String fileConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("fileConfigId", fileConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_GreaterThan(String fileConfigId) {
         setFileConfigId_GreaterThan(fileConfigId, null);
     }
 
     public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -710,7 +746,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -721,7 +758,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -732,7 +770,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,8 +878,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_MatchPhrase(hostname, null);
     }
 
-    public void setHostname_MatchPhrase(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("hostname", hostname);
+    public void setHostname_MatchPhrase(String hostname, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,8 +889,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_MatchPhrasePrefix(hostname, null);
     }
 
-    public void setHostname_MatchPhrasePrefix(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("hostname", hostname);
+    public void setHostname_MatchPhrasePrefix(String hostname, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,8 +900,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_Fuzzy(hostname, null);
     }
 
-    public void setHostname_Fuzzy(String hostname, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("hostname", hostname);
+    public void setHostname_Fuzzy(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -901,12 +940,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHostname_SpanTerm(String hostname) {
+        setHostname_SpanTerm("hostname", null);
+    }
+
+    public void setHostname_SpanTerm(String hostname, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("hostname", hostname);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHostname_GreaterThan(String hostname) {
         setHostname_GreaterThan(hostname, null);
     }
 
     public void setHostname_GreaterThan(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_THAN, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -917,7 +968,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_LessThan(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_THAN, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -928,7 +980,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_GreaterEqual(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_EQUAL, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,7 +992,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_LessEqual(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_EQUAL, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1046,8 +1100,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_MatchPhrase(parameters, null);
     }
 
-    public void setParameters_MatchPhrase(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("parameters", parameters);
+    public void setParameters_MatchPhrase(String parameters, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,8 +1111,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_MatchPhrasePrefix(parameters, null);
     }
 
-    public void setParameters_MatchPhrasePrefix(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("parameters", parameters);
+    public void setParameters_MatchPhrasePrefix(String parameters, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1068,8 +1122,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_Fuzzy(parameters, null);
     }
 
-    public void setParameters_Fuzzy(String parameters, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("parameters", parameters);
+    public void setParameters_Fuzzy(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1108,12 +1162,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setParameters_SpanTerm(String parameters) {
+        setParameters_SpanTerm("parameters", null);
+    }
+
+    public void setParameters_SpanTerm(String parameters, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("parameters", parameters);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setParameters_GreaterThan(String parameters) {
         setParameters_GreaterThan(parameters, null);
     }
 
     public void setParameters_GreaterThan(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_THAN, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1124,7 +1190,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_LessThan(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_THAN, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1135,7 +1202,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_GreaterEqual(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_EQUAL, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1146,7 +1214,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_LessEqual(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_EQUAL, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1253,8 +1322,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrase(password, null);
     }
 
-    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("password", password);
+    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1264,8 +1333,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrasePrefix(password, null);
     }
 
-    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
+    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1275,8 +1344,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_Fuzzy(password, null);
     }
 
-    public void setPassword_Fuzzy(String password, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("password", password);
+    public void setPassword_Fuzzy(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1315,12 +1384,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_SpanTerm(String password) {
+        setPassword_SpanTerm("password", null);
+    }
+
+    public void setPassword_SpanTerm(String password, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("password", password);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_GreaterThan(String password) {
         setPassword_GreaterThan(password, null);
     }
 
     public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1331,7 +1412,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1342,7 +1424,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1353,7 +1436,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1460,8 +1544,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_MatchPhrase(port, null);
     }
 
-    public void setPort_MatchPhrase(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("port", port);
+    public void setPort_MatchPhrase(Integer port, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1471,8 +1555,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_MatchPhrasePrefix(port, null);
     }
 
-    public void setPort_MatchPhrasePrefix(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("port", port);
+    public void setPort_MatchPhrasePrefix(Integer port, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,8 +1566,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_Fuzzy(port, null);
     }
 
-    public void setPort_Fuzzy(Integer port, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("port", port);
+    public void setPort_Fuzzy(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1494,7 +1578,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_GreaterThan(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_THAN, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1505,7 +1590,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_LessThan(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_THAN, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1516,7 +1602,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_GreaterEqual(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_EQUAL, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1527,7 +1614,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_LessEqual(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_EQUAL, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1634,8 +1722,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_MatchPhrase(protocolScheme, null);
     }
 
-    public void setProtocolScheme_MatchPhrase(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_MatchPhrase(String protocolScheme, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1645,8 +1733,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_MatchPhrasePrefix(protocolScheme, null);
     }
 
-    public void setProtocolScheme_MatchPhrasePrefix(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_MatchPhrasePrefix(String protocolScheme, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1656,8 +1744,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_Fuzzy(protocolScheme, null);
     }
 
-    public void setProtocolScheme_Fuzzy(String protocolScheme, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_Fuzzy(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1696,12 +1784,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setProtocolScheme_SpanTerm(String protocolScheme) {
+        setProtocolScheme_SpanTerm("protocolScheme", null);
+    }
+
+    public void setProtocolScheme_SpanTerm(String protocolScheme, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("protocolScheme", protocolScheme);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setProtocolScheme_GreaterThan(String protocolScheme) {
         setProtocolScheme_GreaterThan(protocolScheme, null);
     }
 
     public void setProtocolScheme_GreaterThan(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_THAN, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1712,7 +1812,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_LessThan(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_THAN, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1723,7 +1824,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_GreaterEqual(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_EQUAL, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1734,7 +1836,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_LessEqual(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_EQUAL, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1841,8 +1944,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1852,8 +1955,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1863,8 +1966,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1903,12 +2006,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1919,7 +2034,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1930,7 +2046,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1941,7 +2058,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2048,8 +2166,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2059,8 +2177,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,8 +2188,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2082,7 +2200,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2093,7 +2212,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2104,7 +2224,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2115,7 +2236,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2222,8 +2344,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_MatchPhrase(username, null);
     }
 
-    public void setUsername_MatchPhrase(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("username", username);
+    public void setUsername_MatchPhrase(String username, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,8 +2355,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_MatchPhrasePrefix(username, null);
     }
 
-    public void setUsername_MatchPhrasePrefix(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("username", username);
+    public void setUsername_MatchPhrasePrefix(String username, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2244,8 +2366,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_Fuzzy(username, null);
     }
 
-    public void setUsername_Fuzzy(String username, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("username", username);
+    public void setUsername_Fuzzy(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2284,12 +2406,24 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUsername_SpanTerm(String username) {
+        setUsername_SpanTerm("username", null);
+    }
+
+    public void setUsername_SpanTerm(String username, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("username", username);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUsername_GreaterThan(String username) {
         setUsername_GreaterThan(username, null);
     }
 
     public void setUsername_GreaterThan(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_THAN, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2300,7 +2434,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_LessThan(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_THAN, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2311,7 +2446,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_GreaterEqual(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_EQUAL, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2322,7 +2458,8 @@ public abstract class BsFileAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_LessEqual(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_EQUAL, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
index 0284dd9abd9589768a6e26f5ac662d7efa234e0b..b09fda08c802f81b54ac70711e1d64e75d408446 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FileConfigCQ cq = new FileConfigCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FileConfigCQ cf = new FileConfigCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrase(available, null);
     }
 
-    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("available", available);
+    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrasePrefix(available, null);
     }
 
-    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
+    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setAvailable_Fuzzy(available, null);
     }
 
-    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("available", available);
+    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrase(boost, null);
     }
 
-    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boost", boost);
+    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrasePrefix(boost, null);
     }
 
-    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
+    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setBoost_Fuzzy(boost, null);
     }
 
-    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boost", boost);
+    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,7 +467,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,7 +479,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,7 +491,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +503,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -598,8 +611,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_MatchPhrase(configParameter, null);
     }
 
-    public void setConfigParameter_MatchPhrase(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("configParameter", configParameter);
+    public void setConfigParameter_MatchPhrase(String configParameter, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,8 +622,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_MatchPhrasePrefix(configParameter, null);
     }
 
-    public void setConfigParameter_MatchPhrasePrefix(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("configParameter", configParameter);
+    public void setConfigParameter_MatchPhrasePrefix(String configParameter, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,8 +633,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_Fuzzy(configParameter, null);
     }
 
-    public void setConfigParameter_Fuzzy(String configParameter, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("configParameter", configParameter);
+    public void setConfigParameter_Fuzzy(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +673,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigParameter_SpanTerm(String configParameter) {
+        setConfigParameter_SpanTerm("configParameter", null);
+    }
+
+    public void setConfigParameter_SpanTerm(String configParameter, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("configParameter", configParameter);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigParameter_GreaterThan(String configParameter) {
         setConfigParameter_GreaterThan(configParameter, null);
     }
 
     public void setConfigParameter_GreaterThan(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_THAN, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,7 +701,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_LessThan(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_THAN, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,7 +713,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_GreaterEqual(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_EQUAL, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,7 +725,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_LessEqual(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_EQUAL, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -805,8 +833,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,8 +844,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,8 +855,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -867,12 +895,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -883,7 +923,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -894,7 +935,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -905,7 +947,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1012,8 +1055,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1023,8 +1066,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1034,8 +1077,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1046,7 +1089,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,7 +1101,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1068,7 +1113,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1125,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1186,8 +1233,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setDepth_MatchPhrase(depth, null);
     }
 
-    public void setDepth_MatchPhrase(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("depth", depth);
+    public void setDepth_MatchPhrase(Integer depth, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1197,8 +1244,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setDepth_MatchPhrasePrefix(depth, null);
     }
 
-    public void setDepth_MatchPhrasePrefix(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("depth", depth);
+    public void setDepth_MatchPhrasePrefix(Integer depth, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1208,8 +1255,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setDepth_Fuzzy(depth, null);
     }
 
-    public void setDepth_Fuzzy(Integer depth, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("depth", depth);
+    public void setDepth_Fuzzy(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1220,7 +1267,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_GreaterThan(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_THAN, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1231,7 +1279,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_LessThan(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_THAN, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1242,7 +1291,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_GreaterEqual(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_EQUAL, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1253,7 +1303,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_LessEqual(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_EQUAL, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1360,8 +1411,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocPaths_MatchPhrase(excludedDocPaths, null);
     }
 
-    public void setExcludedDocPaths_MatchPhrase(String excludedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("excludedDocPaths", excludedDocPaths);
+    public void setExcludedDocPaths_MatchPhrase(String excludedDocPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("excludedDocPaths", excludedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1371,8 +1422,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocPaths_MatchPhrasePrefix(excludedDocPaths, null);
     }
 
-    public void setExcludedDocPaths_MatchPhrasePrefix(String excludedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("excludedDocPaths", excludedDocPaths);
+    public void setExcludedDocPaths_MatchPhrasePrefix(String excludedDocPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedDocPaths", excludedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1382,8 +1433,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocPaths_Fuzzy(excludedDocPaths, null);
     }
 
-    public void setExcludedDocPaths_Fuzzy(String excludedDocPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("excludedDocPaths", excludedDocPaths);
+    public void setExcludedDocPaths_Fuzzy(String excludedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("excludedDocPaths", excludedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1422,12 +1473,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedDocPaths_SpanTerm(String excludedDocPaths) {
+        setExcludedDocPaths_SpanTerm("excludedDocPaths", null);
+    }
+
+    public void setExcludedDocPaths_SpanTerm(String excludedDocPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("excludedDocPaths", excludedDocPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedDocPaths_GreaterThan(String excludedDocPaths) {
         setExcludedDocPaths_GreaterThan(excludedDocPaths, null);
     }
 
     public void setExcludedDocPaths_GreaterThan(String excludedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_GREATER_THAN, excludedDocPaths);
+        final Object _value = excludedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1438,7 +1501,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocPaths_LessThan(String excludedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_LESS_THAN, excludedDocPaths);
+        final Object _value = excludedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1449,7 +1513,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocPaths_GreaterEqual(String excludedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_GREATER_EQUAL, excludedDocPaths);
+        final Object _value = excludedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1460,7 +1525,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocPaths_LessEqual(String excludedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_LESS_EQUAL, excludedDocPaths);
+        final Object _value = excludedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedDocPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1567,8 +1633,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedPaths_MatchPhrase(excludedPaths, null);
     }
 
-    public void setExcludedPaths_MatchPhrase(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_MatchPhrase(String excludedPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1578,8 +1644,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedPaths_MatchPhrasePrefix(excludedPaths, null);
     }
 
-    public void setExcludedPaths_MatchPhrasePrefix(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_MatchPhrasePrefix(String excludedPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1589,8 +1655,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setExcludedPaths_Fuzzy(excludedPaths, null);
     }
 
-    public void setExcludedPaths_Fuzzy(String excludedPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_Fuzzy(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1629,12 +1695,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedPaths_SpanTerm(String excludedPaths) {
+        setExcludedPaths_SpanTerm("excludedPaths", null);
+    }
+
+    public void setExcludedPaths_SpanTerm(String excludedPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("excludedPaths", excludedPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedPaths_GreaterThan(String excludedPaths) {
         setExcludedPaths_GreaterThan(excludedPaths, null);
     }
 
     public void setExcludedPaths_GreaterThan(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_THAN, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1645,7 +1723,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_LessThan(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_THAN, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1656,7 +1735,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_GreaterEqual(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_EQUAL, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1667,7 +1747,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_LessEqual(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_EQUAL, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1774,8 +1855,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocPaths_MatchPhrase(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_MatchPhrase(String includedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("includedDocPaths", includedDocPaths);
+    public void setIncludedDocPaths_MatchPhrase(String includedDocPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("includedDocPaths", includedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1785,8 +1866,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocPaths_MatchPhrasePrefix(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_MatchPhrasePrefix(String includedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("includedDocPaths", includedDocPaths);
+    public void setIncludedDocPaths_MatchPhrasePrefix(String includedDocPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedDocPaths", includedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1796,8 +1877,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocPaths_Fuzzy(includedDocPaths, null);
     }
 
-    public void setIncludedDocPaths_Fuzzy(String includedDocPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("includedDocPaths", includedDocPaths);
+    public void setIncludedDocPaths_Fuzzy(String includedDocPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("includedDocPaths", includedDocPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1836,12 +1917,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedDocPaths_SpanTerm(String includedDocPaths) {
+        setIncludedDocPaths_SpanTerm("includedDocPaths", null);
+    }
+
+    public void setIncludedDocPaths_SpanTerm(String includedDocPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("includedDocPaths", includedDocPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedDocPaths_GreaterThan(String includedDocPaths) {
         setIncludedDocPaths_GreaterThan(includedDocPaths, null);
     }
 
     public void setIncludedDocPaths_GreaterThan(String includedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_GREATER_THAN, includedDocPaths);
+        final Object _value = includedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1852,7 +1945,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocPaths_LessThan(String includedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_LESS_THAN, includedDocPaths);
+        final Object _value = includedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1863,7 +1957,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocPaths_GreaterEqual(String includedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_GREATER_EQUAL, includedDocPaths);
+        final Object _value = includedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1874,7 +1969,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocPaths_LessEqual(String includedDocPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_LESS_EQUAL, includedDocPaths);
+        final Object _value = includedDocPaths;
+        RangeQueryBuilder builder = regRangeQ("includedDocPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1981,8 +2077,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedPaths_MatchPhrase(includedPaths, null);
     }
 
-    public void setIncludedPaths_MatchPhrase(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("includedPaths", includedPaths);
+    public void setIncludedPaths_MatchPhrase(String includedPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1992,8 +2088,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedPaths_MatchPhrasePrefix(includedPaths, null);
     }
 
-    public void setIncludedPaths_MatchPhrasePrefix(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("includedPaths", includedPaths);
+    public void setIncludedPaths_MatchPhrasePrefix(String includedPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2003,8 +2099,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIncludedPaths_Fuzzy(includedPaths, null);
     }
 
-    public void setIncludedPaths_Fuzzy(String includedPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("includedPaths", includedPaths);
+    public void setIncludedPaths_Fuzzy(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2043,12 +2139,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedPaths_SpanTerm(String includedPaths) {
+        setIncludedPaths_SpanTerm("includedPaths", null);
+    }
+
+    public void setIncludedPaths_SpanTerm(String includedPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("includedPaths", includedPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedPaths_GreaterThan(String includedPaths) {
         setIncludedPaths_GreaterThan(includedPaths, null);
     }
 
     public void setIncludedPaths_GreaterThan(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_THAN, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2059,7 +2167,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_LessThan(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_THAN, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,7 +2179,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_GreaterEqual(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_EQUAL, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2081,7 +2191,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_LessEqual(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_EQUAL, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2188,8 +2299,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_MatchPhrase(intervalTime, null);
     }
 
-    public void setIntervalTime_MatchPhrase(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("intervalTime", intervalTime);
+    public void setIntervalTime_MatchPhrase(Integer intervalTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2199,8 +2310,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_MatchPhrasePrefix(intervalTime, null);
     }
 
-    public void setIntervalTime_MatchPhrasePrefix(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("intervalTime", intervalTime);
+    public void setIntervalTime_MatchPhrasePrefix(Integer intervalTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2210,8 +2321,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_Fuzzy(intervalTime, null);
     }
 
-    public void setIntervalTime_Fuzzy(Integer intervalTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("intervalTime", intervalTime);
+    public void setIntervalTime_Fuzzy(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2222,7 +2333,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_GreaterThan(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_THAN, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,7 +2345,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_LessThan(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_THAN, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2244,7 +2357,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_GreaterEqual(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_EQUAL, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2255,7 +2369,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_LessEqual(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_EQUAL, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2362,8 +2477,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_MatchPhrase(timeToLive, null);
     }
 
-    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
+    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2373,8 +2488,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_MatchPhrasePrefix(timeToLive, null);
     }
 
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2384,8 +2499,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_Fuzzy(timeToLive, null);
     }
 
-    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
+    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2396,7 +2511,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2407,7 +2523,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2418,7 +2535,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2429,7 +2547,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2536,8 +2655,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_MatchPhrase(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_MatchPhrase(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_MatchPhrase(Long maxAccessCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2547,8 +2666,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_MatchPhrasePrefix(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_MatchPhrasePrefix(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_MatchPhrasePrefix(Long maxAccessCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2558,8 +2677,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_Fuzzy(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_Fuzzy(Long maxAccessCount, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_Fuzzy(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2570,7 +2689,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_GreaterThan(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_THAN, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2581,7 +2701,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_LessThan(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_THAN, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2592,7 +2713,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_GreaterEqual(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2603,7 +2725,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_LessEqual(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_EQUAL, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2710,8 +2833,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2721,8 +2844,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2732,8 +2855,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2772,12 +2895,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2788,7 +2923,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2799,7 +2935,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2810,7 +2947,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2917,8 +3055,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_MatchPhrase(numOfThread, null);
     }
 
-    public void setNumOfThread_MatchPhrase(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("numOfThread", numOfThread);
+    public void setNumOfThread_MatchPhrase(Integer numOfThread, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2928,8 +3066,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_MatchPhrasePrefix(numOfThread, null);
     }
 
-    public void setNumOfThread_MatchPhrasePrefix(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("numOfThread", numOfThread);
+    public void setNumOfThread_MatchPhrasePrefix(Integer numOfThread, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2939,8 +3077,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_Fuzzy(numOfThread, null);
     }
 
-    public void setNumOfThread_Fuzzy(Integer numOfThread, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("numOfThread", numOfThread);
+    public void setNumOfThread_Fuzzy(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2951,7 +3089,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_GreaterThan(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_THAN, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2962,7 +3101,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_LessThan(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_THAN, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2973,7 +3113,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_GreaterEqual(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_EQUAL, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2984,7 +3125,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_LessEqual(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_EQUAL, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3091,8 +3233,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPaths_MatchPhrase(paths, null);
     }
 
-    public void setPaths_MatchPhrase(String paths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("paths", paths);
+    public void setPaths_MatchPhrase(String paths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("paths", paths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3102,8 +3244,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPaths_MatchPhrasePrefix(paths, null);
     }
 
-    public void setPaths_MatchPhrasePrefix(String paths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("paths", paths);
+    public void setPaths_MatchPhrasePrefix(String paths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("paths", paths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3113,8 +3255,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPaths_Fuzzy(paths, null);
     }
 
-    public void setPaths_Fuzzy(String paths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("paths", paths);
+    public void setPaths_Fuzzy(String paths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("paths", paths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3153,12 +3295,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPaths_SpanTerm(String paths) {
+        setPaths_SpanTerm("paths", null);
+    }
+
+    public void setPaths_SpanTerm(String paths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("paths", paths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPaths_GreaterThan(String paths) {
         setPaths_GreaterThan(paths, null);
     }
 
     public void setPaths_GreaterThan(String paths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_GREATER_THAN, paths);
+        final Object _value = paths;
+        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3169,7 +3323,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPaths_LessThan(String paths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_LESS_THAN, paths);
+        final Object _value = paths;
+        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3180,7 +3335,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPaths_GreaterEqual(String paths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_GREATER_EQUAL, paths);
+        final Object _value = paths;
+        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3191,7 +3347,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPaths_LessEqual(String paths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_LESS_EQUAL, paths);
+        final Object _value = paths;
+        RangeQueryBuilder builder = regRangeQ("paths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3298,8 +3455,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3309,8 +3466,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3320,8 +3477,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3360,12 +3517,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3376,7 +3545,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3387,7 +3557,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3398,7 +3569,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3505,8 +3677,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3516,8 +3688,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3527,8 +3699,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3539,7 +3711,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3550,7 +3723,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3561,7 +3735,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3572,7 +3747,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3679,8 +3855,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3690,8 +3866,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3701,8 +3877,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3741,12 +3917,24 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3757,7 +3945,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3768,7 +3957,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3779,7 +3969,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3886,8 +4077,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3897,8 +4088,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3908,8 +4099,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3920,7 +4111,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3931,7 +4123,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3942,7 +4135,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3953,7 +4147,8 @@ public abstract class BsFileConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
index 2554f174b7160d86b9afb58bbba3f207764e4ad1..877b0e4c54eaf034789c0100d37258e9a1be8773 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToLabelCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FileConfigToLabelCQ cq = new FileConfigToLabelCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FileConfigToLabelCQ cf = new FileConfigToLabelCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrase(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrasePrefix(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setFileConfigId_Fuzzy(fileConfigId, null);
     }
 
-    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_SpanTerm(String fileConfigId) {
+        setFileConfigId_SpanTerm("fileConfigId", null);
+    }
+
+    public void setFileConfigId_SpanTerm(String fileConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("fileConfigId", fileConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_GreaterThan(String fileConfigId) {
         setFileConfigId_GreaterThan(fileConfigId, null);
     }
 
     public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrase(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrasePrefix(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_Fuzzy(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,12 +540,24 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_SpanTerm(String labelTypeId) {
+        setLabelTypeId_SpanTerm("labelTypeId", null);
+    }
+
+    public void setLabelTypeId_SpanTerm(String labelTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labelTypeId", labelTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_GreaterThan(String labelTypeId) {
         setLabelTypeId_GreaterThan(labelTypeId, null);
     }
 
     public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -536,7 +568,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,7 +580,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -558,7 +592,8 @@ public abstract class BsFileConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
index a084355f14a9ee70da83503940fd024d81eb389a..af0e0ac405a1163fea3f83001c373e6a8bc5570d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsFileConfigToRoleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FileConfigToRoleCQ cq = new FileConfigToRoleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FileConfigToRoleCQ cf = new FileConfigToRoleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrase(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrase(String fileConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setFileConfigId_MatchPhrasePrefix(fileConfigId, null);
     }
 
-    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_MatchPhrasePrefix(String fileConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setFileConfigId_Fuzzy(fileConfigId, null);
     }
 
-    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
+    public void setFileConfigId_Fuzzy(String fileConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("fileConfigId", fileConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFileConfigId_SpanTerm(String fileConfigId) {
+        setFileConfigId_SpanTerm("fileConfigId", null);
+    }
+
+    public void setFileConfigId_SpanTerm(String fileConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("fileConfigId", fileConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFileConfigId_GreaterThan(String fileConfigId) {
         setFileConfigId_GreaterThan(fileConfigId, null);
     }
 
     public void setFileConfigId_GreaterThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessThan(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_GreaterEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setFileConfigId_LessEqual(String fileConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, fileConfigId);
+        final Object _value = fileConfigId;
+        RangeQueryBuilder builder = regRangeQ("fileConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrase(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrasePrefix(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_Fuzzy(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_SpanTerm(String roleTypeId) {
+        setRoleTypeId_SpanTerm("roleTypeId", null);
+    }
+
+    public void setRoleTypeId_SpanTerm(String roleTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roleTypeId", roleTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_GreaterThan(String roleTypeId) {
         setRoleTypeId_GreaterThan(roleTypeId, null);
     }
 
     public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsFileConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
index 2547fabe1d944d463e8ff710ea8dcd159b8a5d39..9d7613f0f488c7fda91b8c60b54c49aa287a537a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsJobLogCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         JobLogCQ cq = new JobLogCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 JobLogCQ cf = new JobLogCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setEndTime_MatchPhrase(endTime, null);
     }
 
-    public void setEndTime_MatchPhrase(Long endTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("endTime", endTime);
+    public void setEndTime_MatchPhrase(Long endTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("endTime", endTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setEndTime_MatchPhrasePrefix(endTime, null);
     }
 
-    public void setEndTime_MatchPhrasePrefix(Long endTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("endTime", endTime);
+    public void setEndTime_MatchPhrasePrefix(Long endTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("endTime", endTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setEndTime_Fuzzy(endTime, null);
     }
 
-    public void setEndTime_Fuzzy(Long endTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("endTime", endTime);
+    public void setEndTime_Fuzzy(Long endTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("endTime", endTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -283,7 +288,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setEndTime_GreaterThan(Long endTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_GREATER_THAN, endTime);
+        final Object _value = endTime;
+        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,7 +300,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setEndTime_LessThan(Long endTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_LESS_THAN, endTime);
+        final Object _value = endTime;
+        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -305,7 +312,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setEndTime_GreaterEqual(Long endTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_GREATER_EQUAL, endTime);
+        final Object _value = endTime;
+        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,7 +324,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setEndTime_LessEqual(Long endTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_LESS_EQUAL, endTime);
+        final Object _value = endTime;
+        RangeQueryBuilder builder = regRangeQ("endTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,8 +432,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobName_MatchPhrase(jobName, null);
     }
 
-    public void setJobName_MatchPhrase(String jobName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("jobName", jobName);
+    public void setJobName_MatchPhrase(String jobName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("jobName", jobName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -434,8 +443,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobName_MatchPhrasePrefix(jobName, null);
     }
 
-    public void setJobName_MatchPhrasePrefix(String jobName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("jobName", jobName);
+    public void setJobName_MatchPhrasePrefix(String jobName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("jobName", jobName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -445,8 +454,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobName_Fuzzy(jobName, null);
     }
 
-    public void setJobName_Fuzzy(String jobName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("jobName", jobName);
+    public void setJobName_Fuzzy(String jobName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("jobName", jobName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -485,12 +494,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setJobName_SpanTerm(String jobName) {
+        setJobName_SpanTerm("jobName", null);
+    }
+
+    public void setJobName_SpanTerm(String jobName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("jobName", jobName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setJobName_GreaterThan(String jobName) {
         setJobName_GreaterThan(jobName, null);
     }
 
     public void setJobName_GreaterThan(String jobName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_GREATER_THAN, jobName);
+        final Object _value = jobName;
+        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobName_LessThan(String jobName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_LESS_THAN, jobName);
+        final Object _value = jobName;
+        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobName_GreaterEqual(String jobName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_GREATER_EQUAL, jobName);
+        final Object _value = jobName;
+        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobName_LessEqual(String jobName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_LESS_EQUAL, jobName);
+        final Object _value = jobName;
+        RangeQueryBuilder builder = regRangeQ("jobName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,8 +654,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobStatus_MatchPhrase(jobStatus, null);
     }
 
-    public void setJobStatus_MatchPhrase(String jobStatus, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("jobStatus", jobStatus);
+    public void setJobStatus_MatchPhrase(String jobStatus, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("jobStatus", jobStatus);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -641,8 +665,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobStatus_MatchPhrasePrefix(jobStatus, null);
     }
 
-    public void setJobStatus_MatchPhrasePrefix(String jobStatus, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("jobStatus", jobStatus);
+    public void setJobStatus_MatchPhrasePrefix(String jobStatus, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("jobStatus", jobStatus);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,8 +676,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setJobStatus_Fuzzy(jobStatus, null);
     }
 
-    public void setJobStatus_Fuzzy(String jobStatus, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("jobStatus", jobStatus);
+    public void setJobStatus_Fuzzy(String jobStatus, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("jobStatus", jobStatus);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -692,12 +716,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setJobStatus_SpanTerm(String jobStatus) {
+        setJobStatus_SpanTerm("jobStatus", null);
+    }
+
+    public void setJobStatus_SpanTerm(String jobStatus, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("jobStatus", jobStatus);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setJobStatus_GreaterThan(String jobStatus) {
         setJobStatus_GreaterThan(jobStatus, null);
     }
 
     public void setJobStatus_GreaterThan(String jobStatus, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_GREATER_THAN, jobStatus);
+        final Object _value = jobStatus;
+        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -708,7 +744,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobStatus_LessThan(String jobStatus, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_LESS_THAN, jobStatus);
+        final Object _value = jobStatus;
+        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,7 +756,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobStatus_GreaterEqual(String jobStatus, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_GREATER_EQUAL, jobStatus);
+        final Object _value = jobStatus;
+        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -730,7 +768,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobStatus_LessEqual(String jobStatus, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_LESS_EQUAL, jobStatus);
+        final Object _value = jobStatus;
+        RangeQueryBuilder builder = regRangeQ("jobStatus", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -837,8 +876,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptData_MatchPhrase(scriptData, null);
     }
 
-    public void setScriptData_MatchPhrase(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("scriptData", scriptData);
+    public void setScriptData_MatchPhrase(String scriptData, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,8 +887,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptData_MatchPhrasePrefix(scriptData, null);
     }
 
-    public void setScriptData_MatchPhrasePrefix(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("scriptData", scriptData);
+    public void setScriptData_MatchPhrasePrefix(String scriptData, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -859,8 +898,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptData_Fuzzy(scriptData, null);
     }
 
-    public void setScriptData_Fuzzy(String scriptData, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("scriptData", scriptData);
+    public void setScriptData_Fuzzy(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -899,12 +938,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptData_SpanTerm(String scriptData) {
+        setScriptData_SpanTerm("scriptData", null);
+    }
+
+    public void setScriptData_SpanTerm(String scriptData, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("scriptData", scriptData);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptData_GreaterThan(String scriptData) {
         setScriptData_GreaterThan(scriptData, null);
     }
 
     public void setScriptData_GreaterThan(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_THAN, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -915,7 +966,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_LessThan(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_THAN, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -926,7 +978,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_GreaterEqual(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_EQUAL, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -937,7 +990,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_LessEqual(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_EQUAL, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1044,8 +1098,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptResult_MatchPhrase(scriptResult, null);
     }
 
-    public void setScriptResult_MatchPhrase(String scriptResult, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("scriptResult", scriptResult);
+    public void setScriptResult_MatchPhrase(String scriptResult, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("scriptResult", scriptResult);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1055,8 +1109,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptResult_MatchPhrasePrefix(scriptResult, null);
     }
 
-    public void setScriptResult_MatchPhrasePrefix(String scriptResult, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("scriptResult", scriptResult);
+    public void setScriptResult_MatchPhrasePrefix(String scriptResult, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("scriptResult", scriptResult);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1066,8 +1120,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptResult_Fuzzy(scriptResult, null);
     }
 
-    public void setScriptResult_Fuzzy(String scriptResult, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("scriptResult", scriptResult);
+    public void setScriptResult_Fuzzy(String scriptResult, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("scriptResult", scriptResult);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1106,12 +1160,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptResult_SpanTerm(String scriptResult) {
+        setScriptResult_SpanTerm("scriptResult", null);
+    }
+
+    public void setScriptResult_SpanTerm(String scriptResult, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("scriptResult", scriptResult);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptResult_GreaterThan(String scriptResult) {
         setScriptResult_GreaterThan(scriptResult, null);
     }
 
     public void setScriptResult_GreaterThan(String scriptResult, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_GREATER_THAN, scriptResult);
+        final Object _value = scriptResult;
+        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1122,7 +1188,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptResult_LessThan(String scriptResult, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_LESS_THAN, scriptResult);
+        final Object _value = scriptResult;
+        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1133,7 +1200,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptResult_GreaterEqual(String scriptResult, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_GREATER_EQUAL, scriptResult);
+        final Object _value = scriptResult;
+        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1144,7 +1212,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptResult_LessEqual(String scriptResult, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_LESS_EQUAL, scriptResult);
+        final Object _value = scriptResult;
+        RangeQueryBuilder builder = regRangeQ("scriptResult", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1251,8 +1320,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptType_MatchPhrase(scriptType, null);
     }
 
-    public void setScriptType_MatchPhrase(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("scriptType", scriptType);
+    public void setScriptType_MatchPhrase(String scriptType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1262,8 +1331,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptType_MatchPhrasePrefix(scriptType, null);
     }
 
-    public void setScriptType_MatchPhrasePrefix(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("scriptType", scriptType);
+    public void setScriptType_MatchPhrasePrefix(String scriptType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1273,8 +1342,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setScriptType_Fuzzy(scriptType, null);
     }
 
-    public void setScriptType_Fuzzy(String scriptType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("scriptType", scriptType);
+    public void setScriptType_Fuzzy(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1313,12 +1382,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptType_SpanTerm(String scriptType) {
+        setScriptType_SpanTerm("scriptType", null);
+    }
+
+    public void setScriptType_SpanTerm(String scriptType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("scriptType", scriptType);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptType_GreaterThan(String scriptType) {
         setScriptType_GreaterThan(scriptType, null);
     }
 
     public void setScriptType_GreaterThan(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_THAN, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1329,7 +1410,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_LessThan(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_THAN, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1340,7 +1422,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_GreaterEqual(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_EQUAL, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,7 +1434,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_LessEqual(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_EQUAL, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1458,8 +1542,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setStartTime_MatchPhrase(startTime, null);
     }
 
-    public void setStartTime_MatchPhrase(Long startTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("startTime", startTime);
+    public void setStartTime_MatchPhrase(Long startTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("startTime", startTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1469,8 +1553,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setStartTime_MatchPhrasePrefix(startTime, null);
     }
 
-    public void setStartTime_MatchPhrasePrefix(Long startTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("startTime", startTime);
+    public void setStartTime_MatchPhrasePrefix(Long startTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("startTime", startTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1480,8 +1564,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setStartTime_Fuzzy(startTime, null);
     }
 
-    public void setStartTime_Fuzzy(Long startTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("startTime", startTime);
+    public void setStartTime_Fuzzy(Long startTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("startTime", startTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1576,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setStartTime_GreaterThan(Long startTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_GREATER_THAN, startTime);
+        final Object _value = startTime;
+        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,7 +1588,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setStartTime_LessThan(Long startTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_LESS_THAN, startTime);
+        final Object _value = startTime;
+        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1514,7 +1600,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setStartTime_GreaterEqual(Long startTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_GREATER_EQUAL, startTime);
+        final Object _value = startTime;
+        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1525,7 +1612,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setStartTime_LessEqual(Long startTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_LESS_EQUAL, startTime);
+        final Object _value = startTime;
+        RangeQueryBuilder builder = regRangeQ("startTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1632,8 +1720,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrase(target, null);
     }
 
-    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("target", target);
+    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1643,8 +1731,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrasePrefix(target, null);
     }
 
-    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
+    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1654,8 +1742,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setTarget_Fuzzy(target, null);
     }
 
-    public void setTarget_Fuzzy(String target, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("target", target);
+    public void setTarget_Fuzzy(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1694,12 +1782,24 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTarget_SpanTerm(String target) {
+        setTarget_SpanTerm("target", null);
+    }
+
+    public void setTarget_SpanTerm(String target, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("target", target);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTarget_GreaterThan(String target) {
         setTarget_GreaterThan(target, null);
     }
 
     public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1710,7 +1810,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1721,7 +1822,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1732,7 +1834,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1839,8 +1942,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setLastUpdated_MatchPhrase(lastUpdated, null);
     }
 
-    public void setLastUpdated_MatchPhrase(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("lastUpdated", lastUpdated);
+    public void setLastUpdated_MatchPhrase(Long lastUpdated, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("lastUpdated", lastUpdated);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1850,8 +1953,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setLastUpdated_MatchPhrasePrefix(lastUpdated, null);
     }
 
-    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("lastUpdated", lastUpdated);
+    public void setLastUpdated_MatchPhrasePrefix(Long lastUpdated, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("lastUpdated", lastUpdated);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1861,8 +1964,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
         setLastUpdated_Fuzzy(lastUpdated, null);
     }
 
-    public void setLastUpdated_Fuzzy(Long lastUpdated, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("lastUpdated", lastUpdated);
+    public void setLastUpdated_Fuzzy(Long lastUpdated, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("lastUpdated", lastUpdated);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1873,7 +1976,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastUpdated_GreaterThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_THAN, lastUpdated);
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1884,7 +1988,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastUpdated_LessThan(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_THAN, lastUpdated);
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1895,7 +2000,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastUpdated_GreaterEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_EQUAL, lastUpdated);
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1906,7 +2012,8 @@ public abstract class BsJobLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLastUpdated_LessEqual(Long lastUpdated, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_EQUAL, lastUpdated);
+        final Object _value = lastUpdated;
+        RangeQueryBuilder builder = regRangeQ("lastUpdated", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
index 5dfd12dceca7c509e406e37dc6d4bd26c570bac4..4adbd6058bf615db12bef6caabfa1b9ade33e4e2 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsKeyMatchCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         KeyMatchCQ cq = new KeyMatchCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 KeyMatchCQ cf = new KeyMatchCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrase(boost, null);
     }
 
-    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boost", boost);
+    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrasePrefix(boost, null);
     }
 
-    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
+    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setBoost_Fuzzy(boost, null);
     }
 
-    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boost", boost);
+    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -283,7 +288,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,7 +300,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -305,7 +312,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,7 +324,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,8 +432,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -434,8 +443,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -445,8 +454,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -485,12 +494,24 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,8 +654,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -641,8 +665,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,8 +676,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -664,7 +688,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,7 +700,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,7 +712,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -697,7 +724,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -804,8 +832,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setMaxSize_MatchPhrase(maxSize, null);
     }
 
-    public void setMaxSize_MatchPhrase(Integer maxSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("maxSize", maxSize);
+    public void setMaxSize_MatchPhrase(Integer maxSize, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("maxSize", maxSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -815,8 +843,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setMaxSize_MatchPhrasePrefix(maxSize, null);
     }
 
-    public void setMaxSize_MatchPhrasePrefix(Integer maxSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("maxSize", maxSize);
+    public void setMaxSize_MatchPhrasePrefix(Integer maxSize, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("maxSize", maxSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -826,8 +854,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setMaxSize_Fuzzy(maxSize, null);
     }
 
-    public void setMaxSize_Fuzzy(Integer maxSize, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("maxSize", maxSize);
+    public void setMaxSize_Fuzzy(Integer maxSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("maxSize", maxSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,7 +866,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxSize_GreaterThan(Integer maxSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_GREATER_THAN, maxSize);
+        final Object _value = maxSize;
+        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,7 +878,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxSize_LessThan(Integer maxSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_LESS_THAN, maxSize);
+        final Object _value = maxSize;
+        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,7 +890,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxSize_GreaterEqual(Integer maxSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_GREATER_EQUAL, maxSize);
+        final Object _value = maxSize;
+        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -871,7 +902,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxSize_LessEqual(Integer maxSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_LESS_EQUAL, maxSize);
+        final Object _value = maxSize;
+        RangeQueryBuilder builder = regRangeQ("maxSize", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -978,8 +1010,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setQuery_MatchPhrase(query, null);
     }
 
-    public void setQuery_MatchPhrase(String query, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("query", query);
+    public void setQuery_MatchPhrase(String query, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("query", query);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -989,8 +1021,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setQuery_MatchPhrasePrefix(query, null);
     }
 
-    public void setQuery_MatchPhrasePrefix(String query, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("query", query);
+    public void setQuery_MatchPhrasePrefix(String query, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("query", query);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1000,8 +1032,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setQuery_Fuzzy(query, null);
     }
 
-    public void setQuery_Fuzzy(String query, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("query", query);
+    public void setQuery_Fuzzy(String query, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("query", query);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1040,12 +1072,24 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQuery_SpanTerm(String query) {
+        setQuery_SpanTerm("query", null);
+    }
+
+    public void setQuery_SpanTerm(String query, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("query", query);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQuery_GreaterThan(String query) {
         setQuery_GreaterThan(query, null);
     }
 
     public void setQuery_GreaterThan(String query, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_GREATER_THAN, query);
+        final Object _value = query;
+        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,7 +1100,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setQuery_LessThan(String query, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_LESS_THAN, query);
+        final Object _value = query;
+        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,7 +1112,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setQuery_GreaterEqual(String query, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_GREATER_EQUAL, query);
+        final Object _value = query;
+        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1078,7 +1124,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setQuery_LessEqual(String query, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_LESS_EQUAL, query);
+        final Object _value = query;
+        RangeQueryBuilder builder = regRangeQ("query", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1185,8 +1232,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setTerm_MatchPhrase(term, null);
     }
 
-    public void setTerm_MatchPhrase(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("term", term);
+    public void setTerm_MatchPhrase(String term, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1196,8 +1243,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setTerm_MatchPhrasePrefix(term, null);
     }
 
-    public void setTerm_MatchPhrasePrefix(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("term", term);
+    public void setTerm_MatchPhrasePrefix(String term, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1207,8 +1254,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setTerm_Fuzzy(term, null);
     }
 
-    public void setTerm_Fuzzy(String term, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("term", term);
+    public void setTerm_Fuzzy(String term, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("term", term);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1247,12 +1294,24 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTerm_SpanTerm(String term) {
+        setTerm_SpanTerm("term", null);
+    }
+
+    public void setTerm_SpanTerm(String term, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("term", term);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTerm_GreaterThan(String term) {
         setTerm_GreaterThan(term, null);
     }
 
     public void setTerm_GreaterThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_THAN, term);
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,7 +1322,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setTerm_LessThan(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_THAN, term);
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1274,7 +1334,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setTerm_GreaterEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_EQUAL, term);
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1285,7 +1346,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setTerm_LessEqual(String term, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_EQUAL, term);
+        final Object _value = term;
+        RangeQueryBuilder builder = regRangeQ("term", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1392,8 +1454,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1403,8 +1465,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1414,8 +1476,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1454,12 +1516,24 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1470,7 +1544,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1481,7 +1556,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1568,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1599,8 +1676,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1610,8 +1687,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1621,8 +1698,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1633,7 +1710,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1644,7 +1722,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,7 +1734,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1666,7 +1746,8 @@ public abstract class BsKeyMatchCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
index 9adddc736178ee46b667fea2ebc6d61d83863910..f035f3dfc56097d116a2380d3deb8f584cf41872 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelToRoleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         LabelToRoleCQ cq = new LabelToRoleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 LabelToRoleCQ cf = new LabelToRoleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrase(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrasePrefix(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setLabelTypeId_Fuzzy(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_SpanTerm(String labelTypeId) {
+        setLabelTypeId_SpanTerm("labelTypeId", null);
+    }
+
+    public void setLabelTypeId_SpanTerm(String labelTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labelTypeId", labelTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_GreaterThan(String labelTypeId) {
         setLabelTypeId_GreaterThan(labelTypeId, null);
     }
 
     public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrase(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrasePrefix(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_Fuzzy(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_SpanTerm(String roleTypeId) {
+        setRoleTypeId_SpanTerm("roleTypeId", null);
+    }
+
+    public void setRoleTypeId_SpanTerm(String roleTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roleTypeId", roleTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_GreaterThan(String roleTypeId) {
         setRoleTypeId_GreaterThan(roleTypeId, null);
     }
 
     public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsLabelToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
index 51d576781fe2639f2a687eeda826606fc1fd28c2..129ebb8317960d17866ec6032ecb3a1551c3371d 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsLabelTypeCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         LabelTypeCQ cq = new LabelTypeCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 LabelTypeCQ cf = new LabelTypeCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +510,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,8 +654,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setExcludedPaths_MatchPhrase(excludedPaths, null);
     }
 
-    public void setExcludedPaths_MatchPhrase(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_MatchPhrase(String excludedPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -641,8 +665,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setExcludedPaths_MatchPhrasePrefix(excludedPaths, null);
     }
 
-    public void setExcludedPaths_MatchPhrasePrefix(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_MatchPhrasePrefix(String excludedPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,8 +676,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setExcludedPaths_Fuzzy(excludedPaths, null);
     }
 
-    public void setExcludedPaths_Fuzzy(String excludedPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("excludedPaths", excludedPaths);
+    public void setExcludedPaths_Fuzzy(String excludedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("excludedPaths", excludedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -692,12 +716,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedPaths_SpanTerm(String excludedPaths) {
+        setExcludedPaths_SpanTerm("excludedPaths", null);
+    }
+
+    public void setExcludedPaths_SpanTerm(String excludedPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("excludedPaths", excludedPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedPaths_GreaterThan(String excludedPaths) {
         setExcludedPaths_GreaterThan(excludedPaths, null);
     }
 
     public void setExcludedPaths_GreaterThan(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_THAN, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -708,7 +744,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_LessThan(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_THAN, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,7 +756,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_GreaterEqual(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_EQUAL, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -730,7 +768,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedPaths_LessEqual(String excludedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_EQUAL, excludedPaths);
+        final Object _value = excludedPaths;
+        RangeQueryBuilder builder = regRangeQ("excludedPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -837,8 +876,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setIncludedPaths_MatchPhrase(includedPaths, null);
     }
 
-    public void setIncludedPaths_MatchPhrase(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("includedPaths", includedPaths);
+    public void setIncludedPaths_MatchPhrase(String includedPaths, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,8 +887,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setIncludedPaths_MatchPhrasePrefix(includedPaths, null);
     }
 
-    public void setIncludedPaths_MatchPhrasePrefix(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("includedPaths", includedPaths);
+    public void setIncludedPaths_MatchPhrasePrefix(String includedPaths, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -859,8 +898,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setIncludedPaths_Fuzzy(includedPaths, null);
     }
 
-    public void setIncludedPaths_Fuzzy(String includedPaths, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("includedPaths", includedPaths);
+    public void setIncludedPaths_Fuzzy(String includedPaths, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("includedPaths", includedPaths);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -899,12 +938,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedPaths_SpanTerm(String includedPaths) {
+        setIncludedPaths_SpanTerm("includedPaths", null);
+    }
+
+    public void setIncludedPaths_SpanTerm(String includedPaths, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("includedPaths", includedPaths);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedPaths_GreaterThan(String includedPaths) {
         setIncludedPaths_GreaterThan(includedPaths, null);
     }
 
     public void setIncludedPaths_GreaterThan(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_THAN, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -915,7 +966,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_LessThan(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_THAN, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -926,7 +978,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_GreaterEqual(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_EQUAL, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -937,7 +990,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedPaths_LessEqual(String includedPaths, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_EQUAL, includedPaths);
+        final Object _value = includedPaths;
+        RangeQueryBuilder builder = regRangeQ("includedPaths", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1044,8 +1098,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1055,8 +1109,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1066,8 +1120,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1106,12 +1160,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1122,7 +1188,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1133,7 +1200,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1144,7 +1212,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1251,8 +1320,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1262,8 +1331,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1273,8 +1342,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1313,12 +1382,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1329,7 +1410,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1340,7 +1422,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,7 +1434,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1458,8 +1542,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1469,8 +1553,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1480,8 +1564,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1576,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,7 +1588,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1514,7 +1600,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1525,7 +1612,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1632,8 +1720,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1643,8 +1731,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1654,8 +1742,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1694,12 +1782,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1710,7 +1810,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1721,7 +1822,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1732,7 +1834,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1839,8 +1942,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1850,8 +1953,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1861,8 +1964,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1873,7 +1976,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1884,7 +1988,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1895,7 +2000,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1906,7 +2012,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2013,8 +2120,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrase(value, null);
     }
 
-    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("value", value);
+    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2024,8 +2131,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrasePrefix(value, null);
     }
 
-    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
+    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2035,8 +2142,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         setValue_Fuzzy(value, null);
     }
 
-    public void setValue_Fuzzy(String value, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("value", value);
+    public void setValue_Fuzzy(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2075,12 +2182,24 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_SpanTerm(String value) {
+        setValue_SpanTerm("value", null);
+    }
+
+    public void setValue_SpanTerm(String value, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("value", value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_GreaterThan(String value) {
         setValue_GreaterThan(value, null);
     }
 
     public void setValue_GreaterThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2091,7 +2210,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2102,7 +2222,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2113,7 +2234,8 @@ public abstract class BsLabelTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
index 4607cab22db6b7f99b7aafcc6c85fa997ce4a5e4..0b10a75b18d8c18e1e97dfb3232759807a96c17e 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsPathMappingCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         PathMappingCQ cq = new PathMappingCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 PathMappingCQ cf = new PathMappingCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +511,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setProcessType_MatchPhrase(processType, null);
     }
 
-    public void setProcessType_MatchPhrase(String processType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("processType", processType);
+    public void setProcessType_MatchPhrase(String processType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("processType", processType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setProcessType_MatchPhrasePrefix(processType, null);
     }
 
-    public void setProcessType_MatchPhrasePrefix(String processType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("processType", processType);
+    public void setProcessType_MatchPhrasePrefix(String processType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("processType", processType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setProcessType_Fuzzy(processType, null);
     }
 
-    public void setProcessType_Fuzzy(String processType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("processType", processType);
+    public void setProcessType_Fuzzy(String processType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("processType", processType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setProcessType_SpanTerm(String processType) {
+        setProcessType_SpanTerm("processType", null);
+    }
+
+    public void setProcessType_SpanTerm(String processType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("processType", processType);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setProcessType_GreaterThan(String processType) {
         setProcessType_GreaterThan(processType, null);
     }
 
     public void setProcessType_GreaterThan(String processType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_GREATER_THAN, processType);
+        final Object _value = processType;
+        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setProcessType_LessThan(String processType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_LESS_THAN, processType);
+        final Object _value = processType;
+        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setProcessType_GreaterEqual(String processType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_GREATER_EQUAL, processType);
+        final Object _value = processType;
+        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setProcessType_LessEqual(String processType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_LESS_EQUAL, processType);
+        final Object _value = processType;
+        RangeQueryBuilder builder = regRangeQ("processType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setRegex_MatchPhrase(regex, null);
     }
 
-    public void setRegex_MatchPhrase(String regex, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("regex", regex);
+    public void setRegex_MatchPhrase(String regex, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("regex", regex);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setRegex_MatchPhrasePrefix(regex, null);
     }
 
-    public void setRegex_MatchPhrasePrefix(String regex, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("regex", regex);
+    public void setRegex_MatchPhrasePrefix(String regex, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("regex", regex);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setRegex_Fuzzy(regex, null);
     }
 
-    public void setRegex_Fuzzy(String regex, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("regex", regex);
+    public void setRegex_Fuzzy(String regex, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("regex", regex);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRegex_SpanTerm(String regex) {
+        setRegex_SpanTerm("regex", null);
+    }
+
+    public void setRegex_SpanTerm(String regex, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("regex", regex);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRegex_GreaterThan(String regex) {
         setRegex_GreaterThan(regex, null);
     }
 
     public void setRegex_GreaterThan(String regex, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_GREATER_THAN, regex);
+        final Object _value = regex;
+        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegex_LessThan(String regex, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_LESS_THAN, regex);
+        final Object _value = regex;
+        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegex_GreaterEqual(String regex, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_GREATER_EQUAL, regex);
+        final Object _value = regex;
+        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegex_LessEqual(String regex, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_LESS_EQUAL, regex);
+        final Object _value = regex;
+        RangeQueryBuilder builder = regRangeQ("regex", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setReplacement_MatchPhrase(replacement, null);
     }
 
-    public void setReplacement_MatchPhrase(String replacement, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("replacement", replacement);
+    public void setReplacement_MatchPhrase(String replacement, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("replacement", replacement);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setReplacement_MatchPhrasePrefix(replacement, null);
     }
 
-    public void setReplacement_MatchPhrasePrefix(String replacement, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("replacement", replacement);
+    public void setReplacement_MatchPhrasePrefix(String replacement, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("replacement", replacement);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setReplacement_Fuzzy(replacement, null);
     }
 
-    public void setReplacement_Fuzzy(String replacement, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("replacement", replacement);
+    public void setReplacement_Fuzzy(String replacement, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("replacement", replacement);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1107,12 +1161,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setReplacement_SpanTerm(String replacement) {
+        setReplacement_SpanTerm("replacement", null);
+    }
+
+    public void setReplacement_SpanTerm(String replacement, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("replacement", replacement);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setReplacement_GreaterThan(String replacement) {
         setReplacement_GreaterThan(replacement, null);
     }
 
     public void setReplacement_GreaterThan(String replacement, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_GREATER_THAN, replacement);
+        final Object _value = replacement;
+        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,7 +1189,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setReplacement_LessThan(String replacement, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_LESS_THAN, replacement);
+        final Object _value = replacement;
+        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,7 +1201,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setReplacement_GreaterEqual(String replacement, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_GREATER_EQUAL, replacement);
+        final Object _value = replacement;
+        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1145,7 +1213,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setReplacement_LessEqual(String replacement, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_LESS_EQUAL, replacement);
+        final Object _value = replacement;
+        RangeQueryBuilder builder = regRangeQ("replacement", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,8 +1321,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,8 +1332,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1274,8 +1343,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1286,7 +1355,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,7 +1367,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1308,7 +1379,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1319,7 +1391,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1426,8 +1499,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrase(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,8 +1510,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrasePrefix(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,8 +1521,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUserAgent_Fuzzy(userAgent, null);
     }
 
-    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
+    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1488,12 +1561,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserAgent_SpanTerm(String userAgent) {
+        setUserAgent_SpanTerm("userAgent", null);
+    }
+
+    public void setUserAgent_SpanTerm(String userAgent, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserAgent_GreaterThan(String userAgent) {
         setUserAgent_GreaterThan(userAgent, null);
     }
 
     public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1504,7 +1589,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,7 +1601,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,7 +1613,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1633,8 +1721,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1644,8 +1732,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,8 +1743,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1695,12 +1783,24 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1711,7 +1811,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1722,7 +1823,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1733,7 +1835,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1840,8 +1943,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1851,8 +1954,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1862,8 +1965,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1874,7 +1977,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1885,7 +1989,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1896,7 +2001,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1907,7 +2013,8 @@ public abstract class BsPathMappingCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
index 322d19976ea68e47c0ad491fff71ff117d15ab43..ccef0bf3cfcff2ceb958fdaa41fa1ba5a7f0dcd3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRequestHeaderCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         RequestHeaderCQ cq = new RequestHeaderCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 RequestHeaderCQ cf = new RequestHeaderCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +511,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1133,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1090,7 +1145,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,7 +1157,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1112,7 +1169,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,8 +1277,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrase(value, null);
     }
 
-    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("value", value);
+    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,8 +1288,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrasePrefix(value, null);
     }
 
-    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
+    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,8 +1299,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setValue_Fuzzy(value, null);
     }
 
-    public void setValue_Fuzzy(String value, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("value", value);
+    public void setValue_Fuzzy(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1281,12 +1339,24 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_SpanTerm(String value) {
+        setValue_SpanTerm("value", null);
+    }
+
+    public void setValue_SpanTerm(String value, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("value", value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_GreaterThan(String value) {
         setValue_GreaterThan(value, null);
     }
 
     public void setValue_GreaterThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1297,7 +1367,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1308,7 +1379,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1319,7 +1391,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1426,8 +1499,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrase(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,8 +1510,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrasePrefix(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,8 +1521,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         setWebConfigId_Fuzzy(webConfigId, null);
     }
 
-    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
+    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1488,12 +1561,24 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_SpanTerm(String webConfigId) {
+        setWebConfigId_SpanTerm("webConfigId", null);
+    }
+
+    public void setWebConfigId_SpanTerm(String webConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("webConfigId", webConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_GreaterThan(String webConfigId) {
         setWebConfigId_GreaterThan(webConfigId, null);
     }
 
     public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1504,7 +1589,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1515,7 +1601,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,7 +1613,8 @@ public abstract class BsRequestHeaderCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
index 6d806d53189e57f35e3024a30f5b4f3e1921ae32..cae65b0846a3803ccfe272673782d0dda3b621d3 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsRoleTypeCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         RoleTypeCQ cq = new RoleTypeCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 RoleTypeCQ cf = new RoleTypeCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +510,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -630,8 +654,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -641,8 +665,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,8 +676,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -692,12 +716,24 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -708,7 +744,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -719,7 +756,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -730,7 +768,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -837,8 +876,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,8 +887,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -859,8 +898,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -871,7 +910,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,7 +922,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,7 +934,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,7 +946,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1011,8 +1054,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,8 +1065,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1033,8 +1076,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1073,12 +1116,24 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,7 +1144,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,7 +1156,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1111,7 +1168,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1218,8 +1276,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1229,8 +1287,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1240,8 +1298,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,7 +1310,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,7 +1322,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1274,7 +1334,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1285,7 +1346,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1392,8 +1454,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrase(value, null);
     }
 
-    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("value", value);
+    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1403,8 +1465,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrasePrefix(value, null);
     }
 
-    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
+    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1414,8 +1476,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         setValue_Fuzzy(value, null);
     }
 
-    public void setValue_Fuzzy(String value, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("value", value);
+    public void setValue_Fuzzy(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1454,12 +1516,24 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_SpanTerm(String value) {
+        setValue_SpanTerm("value", null);
+    }
+
+    public void setValue_SpanTerm(String value, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("value", value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_GreaterThan(String value) {
         setValue_GreaterThan(value, null);
     }
 
     public void setValue_GreaterThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1470,7 +1544,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1481,7 +1556,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1568,8 @@ public abstract class BsRoleTypeCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
index a6e3a5529d4a7b2a50299eb08c6ef1493d79f68d..463afd4debef431b30e49e32ada48f4e63049af9 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsScheduledJobCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         ScheduledJobCQ cq = new ScheduledJobCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 ScheduledJobCQ cf = new ScheduledJobCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrase(available, null);
     }
 
-    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("available", available);
+    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrasePrefix(available, null);
     }
 
-    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
+    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setAvailable_Fuzzy(available, null);
     }
 
-    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("available", available);
+    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCrawler_MatchPhrase(crawler, null);
     }
 
-    public void setCrawler_MatchPhrase(Boolean crawler, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("crawler", crawler);
+    public void setCrawler_MatchPhrase(Boolean crawler, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("crawler", crawler);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCrawler_MatchPhrasePrefix(crawler, null);
     }
 
-    public void setCrawler_MatchPhrasePrefix(Boolean crawler, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("crawler", crawler);
+    public void setCrawler_MatchPhrasePrefix(Boolean crawler, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("crawler", crawler);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCrawler_Fuzzy(crawler, null);
     }
 
-    public void setCrawler_Fuzzy(Boolean crawler, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("crawler", crawler);
+    public void setCrawler_Fuzzy(Boolean crawler, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("crawler", crawler);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,7 +467,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawler_GreaterThan(Boolean crawler, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_GREATER_THAN, crawler);
+        final Object _value = crawler;
+        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,7 +479,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawler_LessThan(Boolean crawler, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_LESS_THAN, crawler);
+        final Object _value = crawler;
+        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,7 +491,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawler_GreaterEqual(Boolean crawler, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_GREATER_EQUAL, crawler);
+        final Object _value = crawler;
+        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +503,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCrawler_LessEqual(Boolean crawler, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_LESS_EQUAL, crawler);
+        final Object _value = crawler;
+        RangeQueryBuilder builder = regRangeQ("crawler", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -598,8 +611,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -609,8 +622,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,8 +633,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -660,12 +673,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,7 +701,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,7 +713,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -698,7 +725,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -805,8 +833,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,8 +844,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -827,8 +855,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,7 +867,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,7 +879,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,7 +891,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -872,7 +903,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -979,8 +1011,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCronExpression_MatchPhrase(cronExpression, null);
     }
 
-    public void setCronExpression_MatchPhrase(String cronExpression, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("cronExpression", cronExpression);
+    public void setCronExpression_MatchPhrase(String cronExpression, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("cronExpression", cronExpression);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -990,8 +1022,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCronExpression_MatchPhrasePrefix(cronExpression, null);
     }
 
-    public void setCronExpression_MatchPhrasePrefix(String cronExpression, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("cronExpression", cronExpression);
+    public void setCronExpression_MatchPhrasePrefix(String cronExpression, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("cronExpression", cronExpression);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1001,8 +1033,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setCronExpression_Fuzzy(cronExpression, null);
     }
 
-    public void setCronExpression_Fuzzy(String cronExpression, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("cronExpression", cronExpression);
+    public void setCronExpression_Fuzzy(String cronExpression, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("cronExpression", cronExpression);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1041,12 +1073,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCronExpression_SpanTerm(String cronExpression) {
+        setCronExpression_SpanTerm("cronExpression", null);
+    }
+
+    public void setCronExpression_SpanTerm(String cronExpression, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("cronExpression", cronExpression);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCronExpression_GreaterThan(String cronExpression) {
         setCronExpression_GreaterThan(cronExpression, null);
     }
 
     public void setCronExpression_GreaterThan(String cronExpression, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_GREATER_THAN, cronExpression);
+        final Object _value = cronExpression;
+        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,7 +1101,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCronExpression_LessThan(String cronExpression, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_LESS_THAN, cronExpression);
+        final Object _value = cronExpression;
+        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1068,7 +1113,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCronExpression_GreaterEqual(String cronExpression, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_GREATER_EQUAL, cronExpression);
+        final Object _value = cronExpression;
+        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1079,7 +1125,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setCronExpression_LessEqual(String cronExpression, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_LESS_EQUAL, cronExpression);
+        final Object _value = cronExpression;
+        RangeQueryBuilder builder = regRangeQ("cronExpression", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1186,8 +1233,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setJobLogging_MatchPhrase(jobLogging, null);
     }
 
-    public void setJobLogging_MatchPhrase(Boolean jobLogging, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("jobLogging", jobLogging);
+    public void setJobLogging_MatchPhrase(Boolean jobLogging, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("jobLogging", jobLogging);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1197,8 +1244,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setJobLogging_MatchPhrasePrefix(jobLogging, null);
     }
 
-    public void setJobLogging_MatchPhrasePrefix(Boolean jobLogging, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("jobLogging", jobLogging);
+    public void setJobLogging_MatchPhrasePrefix(Boolean jobLogging, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("jobLogging", jobLogging);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1208,8 +1255,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setJobLogging_Fuzzy(jobLogging, null);
     }
 
-    public void setJobLogging_Fuzzy(Boolean jobLogging, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("jobLogging", jobLogging);
+    public void setJobLogging_Fuzzy(Boolean jobLogging, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("jobLogging", jobLogging);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1220,7 +1267,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobLogging_GreaterThan(Boolean jobLogging, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_GREATER_THAN, jobLogging);
+        final Object _value = jobLogging;
+        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1231,7 +1279,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobLogging_LessThan(Boolean jobLogging, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_LESS_THAN, jobLogging);
+        final Object _value = jobLogging;
+        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1242,7 +1291,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobLogging_GreaterEqual(Boolean jobLogging, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_GREATER_EQUAL, jobLogging);
+        final Object _value = jobLogging;
+        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1253,7 +1303,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setJobLogging_LessEqual(Boolean jobLogging, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_LESS_EQUAL, jobLogging);
+        final Object _value = jobLogging;
+        RangeQueryBuilder builder = regRangeQ("jobLogging", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1360,8 +1411,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1371,8 +1422,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1382,8 +1433,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1422,12 +1473,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1438,7 +1501,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1449,7 +1513,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1460,7 +1525,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1567,8 +1633,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptData_MatchPhrase(scriptData, null);
     }
 
-    public void setScriptData_MatchPhrase(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("scriptData", scriptData);
+    public void setScriptData_MatchPhrase(String scriptData, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1578,8 +1644,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptData_MatchPhrasePrefix(scriptData, null);
     }
 
-    public void setScriptData_MatchPhrasePrefix(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("scriptData", scriptData);
+    public void setScriptData_MatchPhrasePrefix(String scriptData, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1589,8 +1655,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptData_Fuzzy(scriptData, null);
     }
 
-    public void setScriptData_Fuzzy(String scriptData, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("scriptData", scriptData);
+    public void setScriptData_Fuzzy(String scriptData, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("scriptData", scriptData);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1629,12 +1695,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptData_SpanTerm(String scriptData) {
+        setScriptData_SpanTerm("scriptData", null);
+    }
+
+    public void setScriptData_SpanTerm(String scriptData, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("scriptData", scriptData);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptData_GreaterThan(String scriptData) {
         setScriptData_GreaterThan(scriptData, null);
     }
 
     public void setScriptData_GreaterThan(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_THAN, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1645,7 +1723,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_LessThan(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_THAN, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1656,7 +1735,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_GreaterEqual(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_EQUAL, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1667,7 +1747,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptData_LessEqual(String scriptData, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_EQUAL, scriptData);
+        final Object _value = scriptData;
+        RangeQueryBuilder builder = regRangeQ("scriptData", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1774,8 +1855,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptType_MatchPhrase(scriptType, null);
     }
 
-    public void setScriptType_MatchPhrase(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("scriptType", scriptType);
+    public void setScriptType_MatchPhrase(String scriptType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1785,8 +1866,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptType_MatchPhrasePrefix(scriptType, null);
     }
 
-    public void setScriptType_MatchPhrasePrefix(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("scriptType", scriptType);
+    public void setScriptType_MatchPhrasePrefix(String scriptType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1796,8 +1877,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setScriptType_Fuzzy(scriptType, null);
     }
 
-    public void setScriptType_Fuzzy(String scriptType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("scriptType", scriptType);
+    public void setScriptType_Fuzzy(String scriptType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("scriptType", scriptType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1836,12 +1917,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setScriptType_SpanTerm(String scriptType) {
+        setScriptType_SpanTerm("scriptType", null);
+    }
+
+    public void setScriptType_SpanTerm(String scriptType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("scriptType", scriptType);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setScriptType_GreaterThan(String scriptType) {
         setScriptType_GreaterThan(scriptType, null);
     }
 
     public void setScriptType_GreaterThan(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_THAN, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1852,7 +1945,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_LessThan(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_THAN, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1863,7 +1957,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_GreaterEqual(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_EQUAL, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1874,7 +1969,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setScriptType_LessEqual(String scriptType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_EQUAL, scriptType);
+        final Object _value = scriptType;
+        RangeQueryBuilder builder = regRangeQ("scriptType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1981,8 +2077,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1992,8 +2088,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2003,8 +2099,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2015,7 +2111,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2026,7 +2123,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2037,7 +2135,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2048,7 +2147,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2155,8 +2255,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrase(target, null);
     }
 
-    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("target", target);
+    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2166,8 +2266,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrasePrefix(target, null);
     }
 
-    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
+    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2177,8 +2277,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setTarget_Fuzzy(target, null);
     }
 
-    public void setTarget_Fuzzy(String target, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("target", target);
+    public void setTarget_Fuzzy(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2217,12 +2317,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTarget_SpanTerm(String target) {
+        setTarget_SpanTerm("target", null);
+    }
+
+    public void setTarget_SpanTerm(String target, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("target", target);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTarget_GreaterThan(String target) {
         setTarget_GreaterThan(target, null);
     }
 
     public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,7 +2345,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2244,7 +2357,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2255,7 +2369,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2362,8 +2477,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2373,8 +2488,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2384,8 +2499,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2424,12 +2539,24 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2440,7 +2567,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2451,7 +2579,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2462,7 +2591,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2569,8 +2699,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2580,8 +2710,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2591,8 +2721,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2603,7 +2733,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2614,7 +2745,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2625,7 +2757,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2636,7 +2769,8 @@ public abstract class BsScheduledJobCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
index 0ea7381c341be303972ada02d05bc3736da3867b..3854645f6f2fcd41af01388e7ea94eaf1d32c2ef 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsThumbnailQueueCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         ThumbnailQueueCQ cq = new ThumbnailQueueCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 ThumbnailQueueCQ cf = new ThumbnailQueueCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,7 +511,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrase(target, null);
     }
 
-    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("target", target);
+    public void setTarget_MatchPhrase(String target, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setTarget_MatchPhrasePrefix(target, null);
     }
 
-    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
+    public void setTarget_MatchPhrasePrefix(String target, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setTarget_Fuzzy(target, null);
     }
 
-    public void setTarget_Fuzzy(String target, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("target", target);
+    public void setTarget_Fuzzy(String target, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("target", target);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTarget_SpanTerm(String target) {
+        setTarget_SpanTerm("target", null);
+    }
+
+    public void setTarget_SpanTerm(String target, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("target", target);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTarget_GreaterThan(String target) {
         setTarget_GreaterThan(target, null);
     }
 
     public void setTarget_GreaterThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessThan(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_GreaterEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setTarget_LessEqual(String target, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, target);
+        final Object _value = target;
+        RangeQueryBuilder builder = regRangeQ("target", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setGenerator_MatchPhrase(generator, null);
     }
 
-    public void setGenerator_MatchPhrase(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("generator", generator);
+    public void setGenerator_MatchPhrase(String generator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("generator", generator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setGenerator_MatchPhrasePrefix(generator, null);
     }
 
-    public void setGenerator_MatchPhrasePrefix(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("generator", generator);
+    public void setGenerator_MatchPhrasePrefix(String generator, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("generator", generator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setGenerator_Fuzzy(generator, null);
     }
 
-    public void setGenerator_Fuzzy(String generator, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("generator", generator);
+    public void setGenerator_Fuzzy(String generator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("generator", generator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setGenerator_SpanTerm(String generator) {
+        setGenerator_SpanTerm("generator", null);
+    }
+
+    public void setGenerator_SpanTerm(String generator, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("generator", generator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setGenerator_GreaterThan(String generator) {
         setGenerator_GreaterThan(generator, null);
     }
 
     public void setGenerator_GreaterThan(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_THAN, generator);
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setGenerator_LessThan(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_THAN, generator);
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setGenerator_GreaterEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_EQUAL, generator);
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setGenerator_LessEqual(String generator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_EQUAL, generator);
+        final Object _value = generator;
+        RangeQueryBuilder builder = regRangeQ("generator", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setPath_MatchPhrase(path, null);
     }
 
-    public void setPath_MatchPhrase(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("path", path);
+    public void setPath_MatchPhrase(String path, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setPath_MatchPhrasePrefix(path, null);
     }
 
-    public void setPath_MatchPhrasePrefix(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("path", path);
+    public void setPath_MatchPhrasePrefix(String path, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setPath_Fuzzy(path, null);
     }
 
-    public void setPath_Fuzzy(String path, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("path", path);
+    public void setPath_Fuzzy(String path, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("path", path);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1107,12 +1161,24 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPath_SpanTerm(String path) {
+        setPath_SpanTerm("path", null);
+    }
+
+    public void setPath_SpanTerm(String path, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("path", path);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPath_GreaterThan(String path) {
         setPath_GreaterThan(path, null);
     }
 
     public void setPath_GreaterThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_THAN, path);
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,7 +1189,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setPath_LessThan(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_THAN, path);
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,7 +1201,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setPath_GreaterEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_EQUAL, path);
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1145,7 +1213,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setPath_LessEqual(String path, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_EQUAL, path);
+        final Object _value = path;
+        RangeQueryBuilder builder = regRangeQ("path", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,8 +1321,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrase(url, null);
     }
 
-    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("url", url);
+    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1263,8 +1332,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrasePrefix(url, null);
     }
 
-    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
+    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1274,8 +1343,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         setUrl_Fuzzy(url, null);
     }
 
-    public void setUrl_Fuzzy(String url, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("url", url);
+    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1314,12 +1383,24 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_SpanTerm(String url) {
+        setUrl_SpanTerm("url", null);
+    }
+
+    public void setUrl_SpanTerm(String url, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_GreaterThan(String url) {
         setUrl_GreaterThan(url, null);
     }
 
     public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1330,7 +1411,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1341,7 +1423,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1352,7 +1435,8 @@ public abstract class BsThumbnailQueueCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
index f8cf6a9bd4b21759fd5d8e7753f5d99d95faea67..2962425f4f367adce2a7e24de52c47104cea220a 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebAuthenticationCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         WebAuthenticationCQ cq = new WebAuthenticationCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 WebAuthenticationCQ cf = new WebAuthenticationCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -251,8 +256,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setAuthRealm_MatchPhrase(authRealm, null);
     }
 
-    public void setAuthRealm_MatchPhrase(String authRealm, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("authRealm", authRealm);
+    public void setAuthRealm_MatchPhrase(String authRealm, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("authRealm", authRealm);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -262,8 +267,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setAuthRealm_MatchPhrasePrefix(authRealm, null);
     }
 
-    public void setAuthRealm_MatchPhrasePrefix(String authRealm, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("authRealm", authRealm);
+    public void setAuthRealm_MatchPhrasePrefix(String authRealm, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("authRealm", authRealm);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -273,8 +278,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setAuthRealm_Fuzzy(authRealm, null);
     }
 
-    public void setAuthRealm_Fuzzy(String authRealm, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("authRealm", authRealm);
+    public void setAuthRealm_Fuzzy(String authRealm, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("authRealm", authRealm);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,12 +318,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAuthRealm_SpanTerm(String authRealm) {
+        setAuthRealm_SpanTerm("authRealm", null);
+    }
+
+    public void setAuthRealm_SpanTerm(String authRealm, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("authRealm", authRealm);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAuthRealm_GreaterThan(String authRealm) {
         setAuthRealm_GreaterThan(authRealm, null);
     }
 
     public void setAuthRealm_GreaterThan(String authRealm, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_GREATER_THAN, authRealm);
+        final Object _value = authRealm;
+        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,7 +346,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setAuthRealm_LessThan(String authRealm, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_LESS_THAN, authRealm);
+        final Object _value = authRealm;
+        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -340,7 +358,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setAuthRealm_GreaterEqual(String authRealm, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_GREATER_EQUAL, authRealm);
+        final Object _value = authRealm;
+        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -351,7 +370,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setAuthRealm_LessEqual(String authRealm, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_LESS_EQUAL, authRealm);
+        final Object _value = authRealm;
+        RangeQueryBuilder builder = regRangeQ("authRealm", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,8 +478,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -469,8 +489,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -480,8 +500,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -520,12 +540,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -536,7 +568,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -547,7 +580,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -558,7 +592,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -665,8 +700,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -676,8 +711,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,8 +722,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -699,7 +734,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -710,7 +746,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -721,7 +758,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -732,7 +770,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -839,8 +878,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_MatchPhrase(hostname, null);
     }
 
-    public void setHostname_MatchPhrase(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("hostname", hostname);
+    public void setHostname_MatchPhrase(String hostname, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -850,8 +889,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_MatchPhrasePrefix(hostname, null);
     }
 
-    public void setHostname_MatchPhrasePrefix(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("hostname", hostname);
+    public void setHostname_MatchPhrasePrefix(String hostname, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -861,8 +900,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setHostname_Fuzzy(hostname, null);
     }
 
-    public void setHostname_Fuzzy(String hostname, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("hostname", hostname);
+    public void setHostname_Fuzzy(String hostname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("hostname", hostname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -901,12 +940,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHostname_SpanTerm(String hostname) {
+        setHostname_SpanTerm("hostname", null);
+    }
+
+    public void setHostname_SpanTerm(String hostname, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("hostname", hostname);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHostname_GreaterThan(String hostname) {
         setHostname_GreaterThan(hostname, null);
     }
 
     public void setHostname_GreaterThan(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_THAN, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -917,7 +968,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_LessThan(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_THAN, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -928,7 +980,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_GreaterEqual(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_EQUAL, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -939,7 +992,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setHostname_LessEqual(String hostname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_EQUAL, hostname);
+        final Object _value = hostname;
+        RangeQueryBuilder builder = regRangeQ("hostname", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1046,8 +1100,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_MatchPhrase(parameters, null);
     }
 
-    public void setParameters_MatchPhrase(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("parameters", parameters);
+    public void setParameters_MatchPhrase(String parameters, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1057,8 +1111,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_MatchPhrasePrefix(parameters, null);
     }
 
-    public void setParameters_MatchPhrasePrefix(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("parameters", parameters);
+    public void setParameters_MatchPhrasePrefix(String parameters, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1068,8 +1122,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setParameters_Fuzzy(parameters, null);
     }
 
-    public void setParameters_Fuzzy(String parameters, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("parameters", parameters);
+    public void setParameters_Fuzzy(String parameters, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("parameters", parameters);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1108,12 +1162,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setParameters_SpanTerm(String parameters) {
+        setParameters_SpanTerm("parameters", null);
+    }
+
+    public void setParameters_SpanTerm(String parameters, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("parameters", parameters);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setParameters_GreaterThan(String parameters) {
         setParameters_GreaterThan(parameters, null);
     }
 
     public void setParameters_GreaterThan(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_THAN, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1124,7 +1190,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_LessThan(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_THAN, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1135,7 +1202,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_GreaterEqual(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_EQUAL, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1146,7 +1214,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setParameters_LessEqual(String parameters, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_EQUAL, parameters);
+        final Object _value = parameters;
+        RangeQueryBuilder builder = regRangeQ("parameters", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1253,8 +1322,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrase(password, null);
     }
 
-    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("password", password);
+    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1264,8 +1333,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrasePrefix(password, null);
     }
 
-    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
+    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1275,8 +1344,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPassword_Fuzzy(password, null);
     }
 
-    public void setPassword_Fuzzy(String password, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("password", password);
+    public void setPassword_Fuzzy(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1315,12 +1384,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_SpanTerm(String password) {
+        setPassword_SpanTerm("password", null);
+    }
+
+    public void setPassword_SpanTerm(String password, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("password", password);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_GreaterThan(String password) {
         setPassword_GreaterThan(password, null);
     }
 
     public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1331,7 +1412,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1342,7 +1424,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1353,7 +1436,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1460,8 +1544,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_MatchPhrase(port, null);
     }
 
-    public void setPort_MatchPhrase(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("port", port);
+    public void setPort_MatchPhrase(Integer port, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1471,8 +1555,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_MatchPhrasePrefix(port, null);
     }
 
-    public void setPort_MatchPhrasePrefix(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("port", port);
+    public void setPort_MatchPhrasePrefix(Integer port, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1482,8 +1566,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setPort_Fuzzy(port, null);
     }
 
-    public void setPort_Fuzzy(Integer port, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("port", port);
+    public void setPort_Fuzzy(Integer port, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("port", port);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1494,7 +1578,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_GreaterThan(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_THAN, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1505,7 +1590,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_LessThan(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_THAN, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1516,7 +1602,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_GreaterEqual(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_EQUAL, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1527,7 +1614,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setPort_LessEqual(Integer port, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_EQUAL, port);
+        final Object _value = port;
+        RangeQueryBuilder builder = regRangeQ("port", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1634,8 +1722,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_MatchPhrase(protocolScheme, null);
     }
 
-    public void setProtocolScheme_MatchPhrase(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_MatchPhrase(String protocolScheme, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1645,8 +1733,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_MatchPhrasePrefix(protocolScheme, null);
     }
 
-    public void setProtocolScheme_MatchPhrasePrefix(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_MatchPhrasePrefix(String protocolScheme, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1656,8 +1744,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setProtocolScheme_Fuzzy(protocolScheme, null);
     }
 
-    public void setProtocolScheme_Fuzzy(String protocolScheme, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("protocolScheme", protocolScheme);
+    public void setProtocolScheme_Fuzzy(String protocolScheme, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("protocolScheme", protocolScheme);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1696,12 +1784,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setProtocolScheme_SpanTerm(String protocolScheme) {
+        setProtocolScheme_SpanTerm("protocolScheme", null);
+    }
+
+    public void setProtocolScheme_SpanTerm(String protocolScheme, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("protocolScheme", protocolScheme);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setProtocolScheme_GreaterThan(String protocolScheme) {
         setProtocolScheme_GreaterThan(protocolScheme, null);
     }
 
     public void setProtocolScheme_GreaterThan(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_THAN, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1712,7 +1812,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_LessThan(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_THAN, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1723,7 +1824,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_GreaterEqual(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_EQUAL, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1734,7 +1836,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setProtocolScheme_LessEqual(String protocolScheme, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_EQUAL, protocolScheme);
+        final Object _value = protocolScheme;
+        RangeQueryBuilder builder = regRangeQ("protocolScheme", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1841,8 +1944,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1852,8 +1955,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1863,8 +1966,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1903,12 +2006,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1919,7 +2034,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1930,7 +2046,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1941,7 +2058,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2048,8 +2166,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2059,8 +2177,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2070,8 +2188,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2082,7 +2200,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2093,7 +2212,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2104,7 +2224,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2115,7 +2236,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2222,8 +2344,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_MatchPhrase(username, null);
     }
 
-    public void setUsername_MatchPhrase(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("username", username);
+    public void setUsername_MatchPhrase(String username, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,8 +2355,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_MatchPhrasePrefix(username, null);
     }
 
-    public void setUsername_MatchPhrasePrefix(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("username", username);
+    public void setUsername_MatchPhrasePrefix(String username, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2244,8 +2366,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setUsername_Fuzzy(username, null);
     }
 
-    public void setUsername_Fuzzy(String username, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("username", username);
+    public void setUsername_Fuzzy(String username, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("username", username);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2284,12 +2406,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUsername_SpanTerm(String username) {
+        setUsername_SpanTerm("username", null);
+    }
+
+    public void setUsername_SpanTerm(String username, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("username", username);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUsername_GreaterThan(String username) {
         setUsername_GreaterThan(username, null);
     }
 
     public void setUsername_GreaterThan(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_THAN, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2300,7 +2434,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_LessThan(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_THAN, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2311,7 +2446,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_GreaterEqual(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_EQUAL, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2322,7 +2458,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setUsername_LessEqual(String username, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_EQUAL, username);
+        final Object _value = username;
+        RangeQueryBuilder builder = regRangeQ("username", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2429,8 +2566,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrase(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2440,8 +2577,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrasePrefix(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2451,8 +2588,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         setWebConfigId_Fuzzy(webConfigId, null);
     }
 
-    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
+    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2491,12 +2628,24 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_SpanTerm(String webConfigId) {
+        setWebConfigId_SpanTerm("webConfigId", null);
+    }
+
+    public void setWebConfigId_SpanTerm(String webConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("webConfigId", webConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_GreaterThan(String webConfigId) {
         setWebConfigId_GreaterThan(webConfigId, null);
     }
 
     public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2507,7 +2656,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2518,7 +2668,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2529,7 +2680,8 @@ public abstract class BsWebAuthenticationCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
index ce665b9fa8776c0208e9583333e8a46ee30c4634..3647bbe063491fa3633d78bf7694b501dd2c2484 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         WebConfigCQ cq = new WebConfigCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 WebConfigCQ cf = new WebConfigCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrase(available, null);
     }
 
-    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("available", available);
+    public void setAvailable_MatchPhrase(Boolean available, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setAvailable_MatchPhrasePrefix(available, null);
     }
 
-    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
+    public void setAvailable_MatchPhrasePrefix(Boolean available, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setAvailable_Fuzzy(available, null);
     }
 
-    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("available", available);
+    public void setAvailable_Fuzzy(Boolean available, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("available", available);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -283,7 +288,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,7 +300,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessThan(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -305,7 +312,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_GreaterEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,7 +324,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setAvailable_LessEqual(Boolean available, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, available);
+        final Object _value = available;
+        RangeQueryBuilder builder = regRangeQ("available", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,8 +432,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrase(boost, null);
     }
 
-    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("boost", boost);
+    public void setBoost_MatchPhrase(Float boost, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -434,8 +443,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setBoost_MatchPhrasePrefix(boost, null);
     }
 
-    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
+    public void setBoost_MatchPhrasePrefix(Float boost, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -445,8 +454,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setBoost_Fuzzy(boost, null);
     }
 
-    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("boost", boost);
+    public void setBoost_Fuzzy(Float boost, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("boost", boost);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,7 +466,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,7 +478,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessThan(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,7 +490,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_GreaterEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +502,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setBoost_LessEqual(Float boost, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, boost);
+        final Object _value = boost;
+        RangeQueryBuilder builder = regRangeQ("boost", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -597,8 +610,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_MatchPhrase(configParameter, null);
     }
 
-    public void setConfigParameter_MatchPhrase(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("configParameter", configParameter);
+    public void setConfigParameter_MatchPhrase(String configParameter, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -608,8 +621,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_MatchPhrasePrefix(configParameter, null);
     }
 
-    public void setConfigParameter_MatchPhrasePrefix(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("configParameter", configParameter);
+    public void setConfigParameter_MatchPhrasePrefix(String configParameter, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -619,8 +632,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setConfigParameter_Fuzzy(configParameter, null);
     }
 
-    public void setConfigParameter_Fuzzy(String configParameter, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("configParameter", configParameter);
+    public void setConfigParameter_Fuzzy(String configParameter, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("configParameter", configParameter);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -659,12 +672,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setConfigParameter_SpanTerm(String configParameter) {
+        setConfigParameter_SpanTerm("configParameter", null);
+    }
+
+    public void setConfigParameter_SpanTerm(String configParameter, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("configParameter", configParameter);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setConfigParameter_GreaterThan(String configParameter) {
         setConfigParameter_GreaterThan(configParameter, null);
     }
 
     public void setConfigParameter_GreaterThan(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_THAN, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,7 +700,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_LessThan(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_THAN, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,7 +712,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_GreaterEqual(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_EQUAL, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -697,7 +724,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setConfigParameter_LessEqual(String configParameter, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_EQUAL, configParameter);
+        final Object _value = configParameter;
+        RangeQueryBuilder builder = regRangeQ("configParameter", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -804,8 +832,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrase(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrase(String createdBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -815,8 +843,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_MatchPhrasePrefix(createdBy, null);
     }
 
-    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
+    public void setCreatedBy_MatchPhrasePrefix(String createdBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -826,8 +854,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedBy_Fuzzy(createdBy, null);
     }
 
-    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
+    public void setCreatedBy_Fuzzy(String createdBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdBy", createdBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -866,12 +894,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCreatedBy_SpanTerm(String createdBy) {
+        setCreatedBy_SpanTerm("createdBy", null);
+    }
+
+    public void setCreatedBy_SpanTerm(String createdBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("createdBy", createdBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCreatedBy_GreaterThan(String createdBy) {
         setCreatedBy_GreaterThan(createdBy, null);
     }
 
     public void setCreatedBy_GreaterThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,7 +922,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessThan(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,7 +934,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_GreaterEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,7 +946,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedBy_LessEqual(String createdBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, createdBy);
+        final Object _value = createdBy;
+        RangeQueryBuilder builder = regRangeQ("createdBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1011,8 +1054,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrase(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrase(Long createdTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,8 +1065,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_MatchPhrasePrefix(createdTime, null);
     }
 
-    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
+    public void setCreatedTime_MatchPhrasePrefix(Long createdTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1033,8 +1076,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setCreatedTime_Fuzzy(createdTime, null);
     }
 
-    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
+    public void setCreatedTime_Fuzzy(Long createdTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdTime", createdTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,7 +1088,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,7 +1100,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessThan(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,7 +1112,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_GreaterEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1078,7 +1124,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedTime_LessEqual(Long createdTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, createdTime);
+        final Object _value = createdTime;
+        RangeQueryBuilder builder = regRangeQ("createdTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1185,8 +1232,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setDepth_MatchPhrase(depth, null);
     }
 
-    public void setDepth_MatchPhrase(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("depth", depth);
+    public void setDepth_MatchPhrase(Integer depth, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1196,8 +1243,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setDepth_MatchPhrasePrefix(depth, null);
     }
 
-    public void setDepth_MatchPhrasePrefix(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("depth", depth);
+    public void setDepth_MatchPhrasePrefix(Integer depth, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1207,8 +1254,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setDepth_Fuzzy(depth, null);
     }
 
-    public void setDepth_Fuzzy(Integer depth, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("depth", depth);
+    public void setDepth_Fuzzy(Integer depth, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("depth", depth);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,7 +1266,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_GreaterThan(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_THAN, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1230,7 +1278,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_LessThan(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_THAN, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1241,7 +1290,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_GreaterEqual(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_EQUAL, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1252,7 +1302,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepth_LessEqual(Integer depth, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_EQUAL, depth);
+        final Object _value = depth;
+        RangeQueryBuilder builder = regRangeQ("depth", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1359,8 +1410,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocUrls_MatchPhrase(excludedDocUrls, null);
     }
 
-    public void setExcludedDocUrls_MatchPhrase(String excludedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("excludedDocUrls", excludedDocUrls);
+    public void setExcludedDocUrls_MatchPhrase(String excludedDocUrls, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("excludedDocUrls", excludedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1370,8 +1421,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocUrls_MatchPhrasePrefix(excludedDocUrls, null);
     }
 
-    public void setExcludedDocUrls_MatchPhrasePrefix(String excludedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("excludedDocUrls", excludedDocUrls);
+    public void setExcludedDocUrls_MatchPhrasePrefix(String excludedDocUrls, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedDocUrls", excludedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1381,8 +1432,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedDocUrls_Fuzzy(excludedDocUrls, null);
     }
 
-    public void setExcludedDocUrls_Fuzzy(String excludedDocUrls, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("excludedDocUrls", excludedDocUrls);
+    public void setExcludedDocUrls_Fuzzy(String excludedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("excludedDocUrls", excludedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1421,12 +1472,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedDocUrls_SpanTerm(String excludedDocUrls) {
+        setExcludedDocUrls_SpanTerm("excludedDocUrls", null);
+    }
+
+    public void setExcludedDocUrls_SpanTerm(String excludedDocUrls, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("excludedDocUrls", excludedDocUrls);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedDocUrls_GreaterThan(String excludedDocUrls) {
         setExcludedDocUrls_GreaterThan(excludedDocUrls, null);
     }
 
     public void setExcludedDocUrls_GreaterThan(String excludedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_GREATER_THAN, excludedDocUrls);
+        final Object _value = excludedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1437,7 +1500,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocUrls_LessThan(String excludedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_LESS_THAN, excludedDocUrls);
+        final Object _value = excludedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1448,7 +1512,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocUrls_GreaterEqual(String excludedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_GREATER_EQUAL, excludedDocUrls);
+        final Object _value = excludedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1459,7 +1524,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedDocUrls_LessEqual(String excludedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_LESS_EQUAL, excludedDocUrls);
+        final Object _value = excludedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedDocUrls", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1566,8 +1632,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedUrls_MatchPhrase(excludedUrls, null);
     }
 
-    public void setExcludedUrls_MatchPhrase(String excludedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("excludedUrls", excludedUrls);
+    public void setExcludedUrls_MatchPhrase(String excludedUrls, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("excludedUrls", excludedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1577,8 +1643,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedUrls_MatchPhrasePrefix(excludedUrls, null);
     }
 
-    public void setExcludedUrls_MatchPhrasePrefix(String excludedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("excludedUrls", excludedUrls);
+    public void setExcludedUrls_MatchPhrasePrefix(String excludedUrls, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("excludedUrls", excludedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1588,8 +1654,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setExcludedUrls_Fuzzy(excludedUrls, null);
     }
 
-    public void setExcludedUrls_Fuzzy(String excludedUrls, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("excludedUrls", excludedUrls);
+    public void setExcludedUrls_Fuzzy(String excludedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("excludedUrls", excludedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1628,12 +1694,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setExcludedUrls_SpanTerm(String excludedUrls) {
+        setExcludedUrls_SpanTerm("excludedUrls", null);
+    }
+
+    public void setExcludedUrls_SpanTerm(String excludedUrls, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("excludedUrls", excludedUrls);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setExcludedUrls_GreaterThan(String excludedUrls) {
         setExcludedUrls_GreaterThan(excludedUrls, null);
     }
 
     public void setExcludedUrls_GreaterThan(String excludedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_GREATER_THAN, excludedUrls);
+        final Object _value = excludedUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1644,7 +1722,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedUrls_LessThan(String excludedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_LESS_THAN, excludedUrls);
+        final Object _value = excludedUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,7 +1734,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedUrls_GreaterEqual(String excludedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_GREATER_EQUAL, excludedUrls);
+        final Object _value = excludedUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1666,7 +1746,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setExcludedUrls_LessEqual(String excludedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_LESS_EQUAL, excludedUrls);
+        final Object _value = excludedUrls;
+        RangeQueryBuilder builder = regRangeQ("excludedUrls", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1773,8 +1854,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocUrls_MatchPhrase(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_MatchPhrase(String includedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("includedDocUrls", includedDocUrls);
+    public void setIncludedDocUrls_MatchPhrase(String includedDocUrls, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("includedDocUrls", includedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1784,8 +1865,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocUrls_MatchPhrasePrefix(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_MatchPhrasePrefix(String includedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("includedDocUrls", includedDocUrls);
+    public void setIncludedDocUrls_MatchPhrasePrefix(String includedDocUrls, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedDocUrls", includedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1795,8 +1876,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedDocUrls_Fuzzy(includedDocUrls, null);
     }
 
-    public void setIncludedDocUrls_Fuzzy(String includedDocUrls, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("includedDocUrls", includedDocUrls);
+    public void setIncludedDocUrls_Fuzzy(String includedDocUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("includedDocUrls", includedDocUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1835,12 +1916,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedDocUrls_SpanTerm(String includedDocUrls) {
+        setIncludedDocUrls_SpanTerm("includedDocUrls", null);
+    }
+
+    public void setIncludedDocUrls_SpanTerm(String includedDocUrls, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("includedDocUrls", includedDocUrls);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedDocUrls_GreaterThan(String includedDocUrls) {
         setIncludedDocUrls_GreaterThan(includedDocUrls, null);
     }
 
     public void setIncludedDocUrls_GreaterThan(String includedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_GREATER_THAN, includedDocUrls);
+        final Object _value = includedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1851,7 +1944,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocUrls_LessThan(String includedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_LESS_THAN, includedDocUrls);
+        final Object _value = includedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1862,7 +1956,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocUrls_GreaterEqual(String includedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_GREATER_EQUAL, includedDocUrls);
+        final Object _value = includedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1873,7 +1968,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedDocUrls_LessEqual(String includedDocUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_LESS_EQUAL, includedDocUrls);
+        final Object _value = includedDocUrls;
+        RangeQueryBuilder builder = regRangeQ("includedDocUrls", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1980,8 +2076,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedUrls_MatchPhrase(includedUrls, null);
     }
 
-    public void setIncludedUrls_MatchPhrase(String includedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("includedUrls", includedUrls);
+    public void setIncludedUrls_MatchPhrase(String includedUrls, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("includedUrls", includedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1991,8 +2087,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedUrls_MatchPhrasePrefix(includedUrls, null);
     }
 
-    public void setIncludedUrls_MatchPhrasePrefix(String includedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("includedUrls", includedUrls);
+    public void setIncludedUrls_MatchPhrasePrefix(String includedUrls, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("includedUrls", includedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2002,8 +2098,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIncludedUrls_Fuzzy(includedUrls, null);
     }
 
-    public void setIncludedUrls_Fuzzy(String includedUrls, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("includedUrls", includedUrls);
+    public void setIncludedUrls_Fuzzy(String includedUrls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("includedUrls", includedUrls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2042,12 +2138,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setIncludedUrls_SpanTerm(String includedUrls) {
+        setIncludedUrls_SpanTerm("includedUrls", null);
+    }
+
+    public void setIncludedUrls_SpanTerm(String includedUrls, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("includedUrls", includedUrls);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setIncludedUrls_GreaterThan(String includedUrls) {
         setIncludedUrls_GreaterThan(includedUrls, null);
     }
 
     public void setIncludedUrls_GreaterThan(String includedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_GREATER_THAN, includedUrls);
+        final Object _value = includedUrls;
+        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2058,7 +2166,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedUrls_LessThan(String includedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_LESS_THAN, includedUrls);
+        final Object _value = includedUrls;
+        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2069,7 +2178,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedUrls_GreaterEqual(String includedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_GREATER_EQUAL, includedUrls);
+        final Object _value = includedUrls;
+        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2080,7 +2190,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIncludedUrls_LessEqual(String includedUrls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_LESS_EQUAL, includedUrls);
+        final Object _value = includedUrls;
+        RangeQueryBuilder builder = regRangeQ("includedUrls", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2187,8 +2298,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_MatchPhrase(intervalTime, null);
     }
 
-    public void setIntervalTime_MatchPhrase(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("intervalTime", intervalTime);
+    public void setIntervalTime_MatchPhrase(Integer intervalTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2198,8 +2309,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_MatchPhrasePrefix(intervalTime, null);
     }
 
-    public void setIntervalTime_MatchPhrasePrefix(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("intervalTime", intervalTime);
+    public void setIntervalTime_MatchPhrasePrefix(Integer intervalTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2209,8 +2320,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setIntervalTime_Fuzzy(intervalTime, null);
     }
 
-    public void setIntervalTime_Fuzzy(Integer intervalTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("intervalTime", intervalTime);
+    public void setIntervalTime_Fuzzy(Integer intervalTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("intervalTime", intervalTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2221,7 +2332,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_GreaterThan(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_THAN, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2232,7 +2344,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_LessThan(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_THAN, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2243,7 +2356,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_GreaterEqual(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_EQUAL, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2254,7 +2368,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setIntervalTime_LessEqual(Integer intervalTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_EQUAL, intervalTime);
+        final Object _value = intervalTime;
+        RangeQueryBuilder builder = regRangeQ("intervalTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2361,8 +2476,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_MatchPhrase(timeToLive, null);
     }
 
-    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
+    public void setTimeToLive_MatchPhrase(Integer timeToLive, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2372,8 +2487,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_MatchPhrasePrefix(timeToLive, null);
     }
 
-    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
+    public void setTimeToLive_MatchPhrasePrefix(Integer timeToLive, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2383,8 +2498,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setTimeToLive_Fuzzy(timeToLive, null);
     }
 
-    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
+    public void setTimeToLive_Fuzzy(Integer timeToLive, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("timeToLive", timeToLive);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2395,7 +2510,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_GreaterThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2406,7 +2522,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_LessThan(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2417,7 +2534,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_GreaterEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2428,7 +2546,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setTimeToLive_LessEqual(Integer timeToLive, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, timeToLive);
+        final Object _value = timeToLive;
+        RangeQueryBuilder builder = regRangeQ("timeToLive", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2535,8 +2654,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_MatchPhrase(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_MatchPhrase(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_MatchPhrase(Long maxAccessCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2546,8 +2665,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_MatchPhrasePrefix(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_MatchPhrasePrefix(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_MatchPhrasePrefix(Long maxAccessCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2557,8 +2676,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setMaxAccessCount_Fuzzy(maxAccessCount, null);
     }
 
-    public void setMaxAccessCount_Fuzzy(Long maxAccessCount, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("maxAccessCount", maxAccessCount);
+    public void setMaxAccessCount_Fuzzy(Long maxAccessCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("maxAccessCount", maxAccessCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2569,7 +2688,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_GreaterThan(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_THAN, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2580,7 +2700,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_LessThan(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_THAN, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2591,7 +2712,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_GreaterEqual(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2602,7 +2724,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setMaxAccessCount_LessEqual(Long maxAccessCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_EQUAL, maxAccessCount);
+        final Object _value = maxAccessCount;
+        RangeQueryBuilder builder = regRangeQ("maxAccessCount", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2709,8 +2832,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2720,8 +2843,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2731,8 +2854,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2771,12 +2894,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2787,7 +2922,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2798,7 +2934,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2809,7 +2946,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2916,8 +3054,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_MatchPhrase(numOfThread, null);
     }
 
-    public void setNumOfThread_MatchPhrase(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("numOfThread", numOfThread);
+    public void setNumOfThread_MatchPhrase(Integer numOfThread, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2927,8 +3065,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_MatchPhrasePrefix(numOfThread, null);
     }
 
-    public void setNumOfThread_MatchPhrasePrefix(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("numOfThread", numOfThread);
+    public void setNumOfThread_MatchPhrasePrefix(Integer numOfThread, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2938,8 +3076,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setNumOfThread_Fuzzy(numOfThread, null);
     }
 
-    public void setNumOfThread_Fuzzy(Integer numOfThread, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("numOfThread", numOfThread);
+    public void setNumOfThread_Fuzzy(Integer numOfThread, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("numOfThread", numOfThread);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2950,7 +3088,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_GreaterThan(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_THAN, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2961,7 +3100,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_LessThan(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_THAN, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2972,7 +3112,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_GreaterEqual(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_EQUAL, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2983,7 +3124,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setNumOfThread_LessEqual(Integer numOfThread, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_EQUAL, numOfThread);
+        final Object _value = numOfThread;
+        RangeQueryBuilder builder = regRangeQ("numOfThread", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3090,8 +3232,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrase(permissions, null);
     }
 
-    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
+    public void setPermissions_MatchPhrase(String permissions, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3101,8 +3243,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setPermissions_MatchPhrasePrefix(permissions, null);
     }
 
-    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
+    public void setPermissions_MatchPhrasePrefix(String permissions, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3112,8 +3254,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setPermissions_Fuzzy(permissions, null);
     }
 
-    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("permissions", permissions);
+    public void setPermissions_Fuzzy(String permissions, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("permissions", permissions);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3152,12 +3294,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPermissions_SpanTerm(String permissions) {
+        setPermissions_SpanTerm("permissions", null);
+    }
+
+    public void setPermissions_SpanTerm(String permissions, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("permissions", permissions);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPermissions_GreaterThan(String permissions) {
         setPermissions_GreaterThan(permissions, null);
     }
 
     public void setPermissions_GreaterThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3168,7 +3322,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessThan(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3179,7 +3334,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_GreaterEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3190,7 +3346,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setPermissions_LessEqual(String permissions, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, permissions);
+        final Object _value = permissions;
+        RangeQueryBuilder builder = regRangeQ("permissions", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3297,8 +3454,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrase(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrase(Integer sortOrder, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3308,8 +3465,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_MatchPhrasePrefix(sortOrder, null);
     }
 
-    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
+    public void setSortOrder_MatchPhrasePrefix(Integer sortOrder, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3319,8 +3476,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setSortOrder_Fuzzy(sortOrder, null);
     }
 
-    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
+    public void setSortOrder_Fuzzy(Integer sortOrder, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("sortOrder", sortOrder);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3331,7 +3488,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3342,7 +3500,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessThan(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3353,7 +3512,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_GreaterEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3364,7 +3524,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setSortOrder_LessEqual(Integer sortOrder, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, sortOrder);
+        final Object _value = sortOrder;
+        RangeQueryBuilder builder = regRangeQ("sortOrder", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3471,8 +3632,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrase(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrase(String updatedBy, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3482,8 +3643,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_MatchPhrasePrefix(updatedBy, null);
     }
 
-    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
+    public void setUpdatedBy_MatchPhrasePrefix(String updatedBy, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3493,8 +3654,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedBy_Fuzzy(updatedBy, null);
     }
 
-    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
+    public void setUpdatedBy_Fuzzy(String updatedBy, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedBy", updatedBy);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3533,12 +3694,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUpdatedBy_SpanTerm(String updatedBy) {
+        setUpdatedBy_SpanTerm("updatedBy", null);
+    }
+
+    public void setUpdatedBy_SpanTerm(String updatedBy, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("updatedBy", updatedBy);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUpdatedBy_GreaterThan(String updatedBy) {
         setUpdatedBy_GreaterThan(updatedBy, null);
     }
 
     public void setUpdatedBy_GreaterThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3549,7 +3722,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessThan(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3560,7 +3734,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_GreaterEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3571,7 +3746,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedBy_LessEqual(String updatedBy, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, updatedBy);
+        final Object _value = updatedBy;
+        RangeQueryBuilder builder = regRangeQ("updatedBy", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3678,8 +3854,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrase(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrase(Long updatedTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3689,8 +3865,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_MatchPhrasePrefix(updatedTime, null);
     }
 
-    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
+    public void setUpdatedTime_MatchPhrasePrefix(Long updatedTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3700,8 +3876,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUpdatedTime_Fuzzy(updatedTime, null);
     }
 
-    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
+    public void setUpdatedTime_Fuzzy(Long updatedTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedTime", updatedTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3712,7 +3888,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3723,7 +3900,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessThan(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3734,7 +3912,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_GreaterEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3745,7 +3924,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedTime_LessEqual(Long updatedTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, updatedTime);
+        final Object _value = updatedTime;
+        RangeQueryBuilder builder = regRangeQ("updatedTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3852,8 +4032,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUrls_MatchPhrase(urls, null);
     }
 
-    public void setUrls_MatchPhrase(String urls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("urls", urls);
+    public void setUrls_MatchPhrase(String urls, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("urls", urls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3863,8 +4043,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUrls_MatchPhrasePrefix(urls, null);
     }
 
-    public void setUrls_MatchPhrasePrefix(String urls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("urls", urls);
+    public void setUrls_MatchPhrasePrefix(String urls, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("urls", urls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3874,8 +4054,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUrls_Fuzzy(urls, null);
     }
 
-    public void setUrls_Fuzzy(String urls, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("urls", urls);
+    public void setUrls_Fuzzy(String urls, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("urls", urls);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3914,12 +4094,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrls_SpanTerm(String urls) {
+        setUrls_SpanTerm("urls", null);
+    }
+
+    public void setUrls_SpanTerm(String urls, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("urls", urls);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrls_GreaterThan(String urls) {
         setUrls_GreaterThan(urls, null);
     }
 
     public void setUrls_GreaterThan(String urls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_GREATER_THAN, urls);
+        final Object _value = urls;
+        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3930,7 +4122,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrls_LessThan(String urls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_LESS_THAN, urls);
+        final Object _value = urls;
+        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3941,7 +4134,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrls_GreaterEqual(String urls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_GREATER_EQUAL, urls);
+        final Object _value = urls;
+        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3952,7 +4146,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrls_LessEqual(String urls, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_LESS_EQUAL, urls);
+        final Object _value = urls;
+        RangeQueryBuilder builder = regRangeQ("urls", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4059,8 +4254,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrase(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4070,8 +4265,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrasePrefix(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4081,8 +4276,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         setUserAgent_Fuzzy(userAgent, null);
     }
 
-    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
+    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4121,12 +4316,24 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserAgent_SpanTerm(String userAgent) {
+        setUserAgent_SpanTerm("userAgent", null);
+    }
+
+    public void setUserAgent_SpanTerm(String userAgent, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserAgent_GreaterThan(String userAgent) {
         setUserAgent_GreaterThan(userAgent, null);
     }
 
     public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4137,7 +4344,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4148,7 +4356,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4159,7 +4368,8 @@ public abstract class BsWebConfigCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
index 48e664bebec8c2850c88622b5b01501fc5c53503..aef6fe39fc34fadf484b6343224b3146d9e5a946 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToLabelCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         WebConfigToLabelCQ cq = new WebConfigToLabelCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 WebConfigToLabelCQ cf = new WebConfigToLabelCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrase(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrase(String labelTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_MatchPhrasePrefix(labelTypeId, null);
     }
 
-    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_MatchPhrasePrefix(String labelTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setLabelTypeId_Fuzzy(labelTypeId, null);
     }
 
-    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
+    public void setLabelTypeId_Fuzzy(String labelTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labelTypeId", labelTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabelTypeId_SpanTerm(String labelTypeId) {
+        setLabelTypeId_SpanTerm("labelTypeId", null);
+    }
+
+    public void setLabelTypeId_SpanTerm(String labelTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labelTypeId", labelTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabelTypeId_GreaterThan(String labelTypeId) {
         setLabelTypeId_GreaterThan(labelTypeId, null);
     }
 
     public void setLabelTypeId_GreaterThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessThan(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_GreaterEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabelTypeId_LessEqual(String labelTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, labelTypeId);
+        final Object _value = labelTypeId;
+        RangeQueryBuilder builder = regRangeQ("labelTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrase(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrasePrefix(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         setWebConfigId_Fuzzy(webConfigId, null);
     }
 
-    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
+    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_SpanTerm(String webConfigId) {
+        setWebConfigId_SpanTerm("webConfigId", null);
+    }
+
+    public void setWebConfigId_SpanTerm(String webConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("webConfigId", webConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_GreaterThan(String webConfigId) {
         setWebConfigId_GreaterThan(webConfigId, null);
     }
 
     public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsWebConfigToLabelCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
index 566d954ce0534d2b9b549420d3da54d9b1b2cf66..c38b4f4deb68ad24760a26f334305e6ac08bb7a6 100644
--- a/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/config/cbean/cq/bs/BsWebConfigToRoleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.config.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.config.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         WebConfigToRoleCQ cq = new WebConfigToRoleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 WebConfigToRoleCQ cf = new WebConfigToRoleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrase(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrase(String roleTypeId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_MatchPhrasePrefix(roleTypeId, null);
     }
 
-    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_MatchPhrasePrefix(String roleTypeId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setRoleTypeId_Fuzzy(roleTypeId, null);
     }
 
-    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
+    public void setRoleTypeId_Fuzzy(String roleTypeId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roleTypeId", roleTypeId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoleTypeId_SpanTerm(String roleTypeId) {
+        setRoleTypeId_SpanTerm("roleTypeId", null);
+    }
+
+    public void setRoleTypeId_SpanTerm(String roleTypeId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roleTypeId", roleTypeId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoleTypeId_GreaterThan(String roleTypeId) {
         setRoleTypeId_GreaterThan(roleTypeId, null);
     }
 
     public void setRoleTypeId_GreaterThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessThan(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_GreaterEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoleTypeId_LessEqual(String roleTypeId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, roleTypeId);
+        final Object _value = roleTypeId;
+        RangeQueryBuilder builder = regRangeQ("roleTypeId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrase(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrase(String webConfigId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setWebConfigId_MatchPhrasePrefix(webConfigId, null);
     }
 
-    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
+    public void setWebConfigId_MatchPhrasePrefix(String webConfigId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         setWebConfigId_Fuzzy(webConfigId, null);
     }
 
-    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
+    public void setWebConfigId_Fuzzy(String webConfigId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("webConfigId", webConfigId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setWebConfigId_SpanTerm(String webConfigId) {
+        setWebConfigId_SpanTerm("webConfigId", null);
+    }
+
+    public void setWebConfigId_SpanTerm(String webConfigId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("webConfigId", webConfigId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setWebConfigId_GreaterThan(String webConfigId) {
         setWebConfigId_GreaterThan(webConfigId, null);
     }
 
     public void setWebConfigId_GreaterThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessThan(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_GreaterEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsWebConfigToRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setWebConfigId_LessEqual(String webConfigId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, webConfigId);
+        final Object _value = webConfigId;
+        RangeQueryBuilder builder = regRangeQ("webConfigId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
index 12b0f1b2415bdd6539685cc0bed5f88f86511633..a798d558291fe83d8e59be86bad74e6e518d510d 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractBehavior.java
@@ -39,6 +39,7 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -266,7 +267,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
 
         final IndexResponse response = builder.execute().actionGet(indexTimeout);
         esEntity.asDocMeta().id(response.getId());
-        return response.isCreated() ? 1 : 0;
+        return response.getResult() == Result.CREATED ? 1 : 0;
     }
 
     protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
@@ -315,7 +316,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final DeleteRequestBuilder builder = createDeleteRequest(esEntity);
 
         final DeleteResponse response = builder.execute().actionGet(deleteTimeout);
-        return response.isFound() ? 1 : 0;
+        return response.getResult() == Result.DELETED ? 1 : 0;
     }
 
     protected DeleteRequestBuilder createDeleteRequest(final EsAbstractEntity esEntity) {
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
index adf4d87397dbb300b36512c4676fd52d1cfd7b48..74d82a7f168eebfa810ca67d13c9a7d55d92d2b7 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionAggregation.java
@@ -25,28 +25,28 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,148 +58,148 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationBuilderList;
+    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
 
     public boolean hasAggregations() {
-        return aggregationBuilderList != null && !aggregationBuilderList.isEmpty();
+        return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
     public List<AbstractAggregationBuilder> getAggregationBuilderList() {
-        return aggregationBuilderList != null ? aggregationBuilderList : Collections.emptyList();
+        return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
     // ===================================================================================
     //                                                                         Aggregation
     //                                                                               =====
-    public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-        assertObjectNotNull("aggregationBuilder", aggregationBuilder);
-        regA(aggregationBuilder);
+    public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) {
+        assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder);
+        regA(aggregationAggregationBuilder);
     }
 
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
 
-    protected AvgBuilder regAvgA(String name, String field) {
-        AvgBuilder builder = AggregationBuilders.avg(name).field(field);
+    protected AvgAggregationBuilder regAvgA(String name, String field) {
+        AvgAggregationBuilder builder = AggregationBuilders.avg(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MaxBuilder regMaxA(String name, String field) {
-        MaxBuilder builder = AggregationBuilders.max(name).field(field);
+    protected MaxAggregationBuilder regMaxA(String name, String field) {
+        MaxAggregationBuilder builder = AggregationBuilders.max(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MinBuilder regMinA(String name, String field) {
-        MinBuilder builder = AggregationBuilders.min(name).field(field);
+    protected MinAggregationBuilder regMinA(String name, String field) {
+        MinAggregationBuilder builder = AggregationBuilders.min(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SumBuilder regSumA(String name, String field) {
-        SumBuilder builder = AggregationBuilders.sum(name).field(field);
+    protected SumAggregationBuilder regSumA(String name, String field) {
+        SumAggregationBuilder builder = AggregationBuilders.sum(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ExtendedStatsBuilder regExtendedStatsA(String name, String field) {
-        ExtendedStatsBuilder builder = AggregationBuilders.extendedStats(name).field(field);
+    protected ExtendedStatsAggregationBuilder regExtendedStatsA(String name, String field) {
+        ExtendedStatsAggregationBuilder builder = AggregationBuilders.extendedStats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected StatsBuilder regStatsA(String name, String field) {
-        StatsBuilder builder = AggregationBuilders.stats(name).field(field);
+    protected StatsAggregationBuilder regStatsA(String name, String field) {
+        StatsAggregationBuilder builder = AggregationBuilders.stats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentilesBuilder regPercentilesA(String name, String field) {
-        PercentilesBuilder builder = AggregationBuilders.percentiles(name).field(field);
+    protected PercentilesAggregationBuilder regPercentilesA(String name, String field) {
+        PercentilesAggregationBuilder builder = AggregationBuilders.percentiles(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentileRanksBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected CardinalityBuilder regCardinalityA(String name, String field) {
-        CardinalityBuilder builder = AggregationBuilders.cardinality(name).field(field);
+    protected CardinalityAggregationBuilder regCardinalityA(String name, String field) {
+        CardinalityAggregationBuilder builder = AggregationBuilders.cardinality(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ValueCountBuilder regCountA(String name, String field) {
-        ValueCountBuilder builder = AggregationBuilders.count(name).field(field);
+    protected ValueCountAggregationBuilder regCountA(String name, String field) {
+        ValueCountAggregationBuilder builder = AggregationBuilders.count(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected TermsBuilder regTermsA(String name, String field) {
-        TermsBuilder builder = AggregationBuilders.terms(name).field(field);
+    protected TermsAggregationBuilder regTermsA(String name, String field) {
+        TermsAggregationBuilder builder = AggregationBuilders.terms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SignificantTermsBuilder regSignificantTermsA(String name, String field) {
-        SignificantTermsBuilder builder = AggregationBuilders.significantTerms(name).field(field);
+    protected SignificantTermsAggregationBuilder regSignificantTermsA(String name, String field) {
+        SignificantTermsAggregationBuilder builder = AggregationBuilders.significantTerms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected HistogramBuilder regHistogramA(String name, String field) {
-        HistogramBuilder builder = AggregationBuilders.histogram(name).field(field);
+    protected HistogramAggregationBuilder regHistogramA(String name, String field) {
+        HistogramAggregationBuilder builder = AggregationBuilders.histogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateHistogramBuilder regDateHistogramA(String name, String field) {
-        DateHistogramBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
+    protected DateHistogramAggregationBuilder regDateHistogramA(String name, String field) {
+        DateHistogramAggregationBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected RangeBuilder regRangeA(String name, String field) {
-        RangeBuilder builder = AggregationBuilders.range(name).field(field);
+    protected RangeAggregationBuilder regRangeA(String name, String field) {
+        RangeAggregationBuilder builder = AggregationBuilders.range(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateRangeBuilder regDateRangeA(String name, String field) {
-        DateRangeBuilder builder = AggregationBuilders.dateRange(name).field(field);
+    protected DateRangeAggregationBuilder regDateRangeA(String name, String field) {
+        DateRangeAggregationBuilder builder = AggregationBuilders.dateRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected IPv4RangeBuilder regIpRangeA(String name, String field) {
-        IPv4RangeBuilder builder = AggregationBuilders.ipRange(name).field(field);
+    protected IpRangeAggregationBuilder regIpRangeA(String name, String field) {
+        IpRangeAggregationBuilder builder = AggregationBuilders.ipRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MissingBuilder regMissingA(String name, String field) {
-        MissingBuilder builder = AggregationBuilders.missing(name).field(field);
+    protected MissingAggregationBuilder regMissingA(String name, String field) {
+        MissingAggregationBuilder builder = AggregationBuilders.missing(name).field(field);
         regA(builder);
         return builder;
     }
 
     protected FilterAggregationBuilder regFilterA(String name, QueryBuilder filter) {
-        FilterAggregationBuilder builder = AggregationBuilders.filter(name).filter(filter);
+        FilterAggregationBuilder builder = AggregationBuilders.filter(name, filter);
         regA(builder);
         return builder;
     }
 
-    protected GlobalBuilder regGlobalA(String name) {
-        GlobalBuilder builder = AggregationBuilders.global(name);
+    protected GlobalAggregationBuilder regGlobalA(String name) {
+        GlobalAggregationBuilder builder = AggregationBuilders.global(name);
         regA(builder);
         return builder;
     }
@@ -210,24 +210,24 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected ScriptedMetricBuilder regScriptedMetricA(String name) {
-        ScriptedMetricBuilder builder = AggregationBuilders.scriptedMetric(name);
+    protected ScriptedMetricAggregationBuilder regScriptedMetricA(String name) {
+        ScriptedMetricAggregationBuilder builder = AggregationBuilders.scriptedMetric(name);
         regA(builder);
         return builder;
     }
 
-    protected TopHitsBuilder regTopHitsA(String name) {
-        TopHitsBuilder builder = AggregationBuilders.topHits(name);
+    protected TopHitsAggregationBuilder regTopHitsA(String name) {
+        TopHitsAggregationBuilder builder = AggregationBuilders.topHits(name);
         regA(builder);
         return builder;
     }
 
     protected void regA(AbstractAggregationBuilder builder) {
         assertObjectNotNull("builder", builder);
-        if (aggregationBuilderList == null) {
-            aggregationBuilderList = new ArrayList<>();
+        if (aggregationAggregationBuilderList == null) {
+            aggregationAggregationBuilderList = new ArrayList<>();
         }
-        aggregationBuilderList.add(builder);
+        aggregationAggregationBuilderList.add(builder);
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
index 4775e92a264c3322d5a9a30acd4fa88c2cc746cc..7641c73bc228555d823cc2fcf836978b0efd2782 100644
--- a/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/log/allcommon/EsAbstractConditionQuery.java
@@ -15,10 +15,16 @@
  */
 package org.codelibs.fess.es.log.allcommon;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
@@ -32,12 +38,14 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -46,10 +54,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
@@ -152,8 +162,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     //                                                                            Register
     //                                                                            ========
 
-    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder) {
-        FunctionScoreQueryBuilder functionScoreQuery = QueryBuilders.functionScoreQuery(queryBuilder);
+    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder, Collection<FilterFunctionBuilder> list) {
+        FunctionScoreQueryBuilder functionScoreQuery =
+                QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
         regQ(functionScoreQuery);
         return functionScoreQuery;
     }
@@ -197,7 +208,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     protected IdsQueryBuilder regIdsQ(Collection<String> values) {
         checkEsInvalidQueryCollection("_id", values);
-        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values.toArray(new String[values.size()]));
         regQ(idsQuery);
         return idsQuery;
     }
@@ -209,23 +220,23 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhraseQ(String name, Object value) {
+    protected MatchPhraseQueryBuilder regMatchPhraseQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
+        MatchPhraseQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
+    protected MatchPhrasePrefixQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
+        MatchPhrasePrefixQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected FuzzyQueryBuilder regFuzzyQ(String name, Object value) {
+    protected MatchQueryBuilder regFuzzyQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        FuzzyQueryBuilder fuzzyQuery = QueryBuilders.fuzzyQuery(name, value);
+        MatchQueryBuilder fuzzyQuery = QueryBuilders.matchQuery(name, value).fuzziness(Fuzziness.AUTO);
         regQ(fuzzyQuery);
         return fuzzyQuery;
     }
@@ -297,12 +308,19 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return commonTermsQuery;
     }
 
-    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name) {
-        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(name);
+    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name, String[] likeTexts) {
+        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(new String[] { name }, likeTexts, null);
         regQ(moreLikeThisQuery);
         return moreLikeThisQuery;
     }
 
+    protected SpanTermQueryBuilder regSpanTermQ(String name, String value) {
+        checkEsInvalidQuery(name, value);
+        SpanTermQueryBuilder spanTermQuery = QueryBuilders.spanTermQuery(name, value);
+        regQ(spanTermQuery);
+        return spanTermQuery;
+    }
+
     protected void regQ(QueryBuilder builder) {
         assertObjectNotNull("builder", builder);
         if (queryBuilderList == null) {
@@ -488,6 +506,28 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         }
     }
 
+    protected String toRangeDateString(Date date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.getTime());
+        } else if (format.contains("date_optional_time")) {
+            final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            return sdf.format(date);
+        } else {
+            return Long.toString(date.getTime());
+        }
+    }
+
+    protected String toRangeLocalDateTimeString(LocalDateTime date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        } else if (format.contains("date_optional_time")) {
+            return DateTimeFormatter.ISO_DATE_TIME.format(date);
+        } else {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        }
+    }
+
     // ===================================================================================
     //                                                                        Assist Class
     //                                                                        ============
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
index ea39a7ff308f8effb0674bb9ea2624ecc31186f6..334beabc72d35a1038f888588e3a2dd8e1e3c06e 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/ClickLogDbm.java
@@ -130,12 +130,12 @@ public class ClickLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null,
             false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnOrder = cci("order", "order", null, null, Integer.class, "order", null, false, false, false,
             "Integer", 0, 0, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
index b6fcb0601a9c42030bfe136059d2a183199f27a0..f7552d054f467b50d9744fa8f6f1c9802a8b52d1 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/FavoriteLogDbm.java
@@ -125,14 +125,14 @@ public class FavoriteLogDbm extends AbstractDBMeta {
     //                                                                         ===========
     protected final ColumnInfo _columnCreatedAt = cci("createdAt", "createdAt", null, null, LocalDateTime.class, "createdAt", null, false,
             false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "String", 0, 0,
+    protected final ColumnInfo _columnUrl = cci("url", "url", null, null, String.class, "url", null, false, false, false, "keyword", 0, 0,
             null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnDocId = cci("docId", "docId", null, null, String.class, "docId", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnCreatedAt() {
         return _columnCreatedAt;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
index e6294d9f74f2d691513cf9ede38c253d47a08b15..da209c411705b473de343e6c800329362aa0d7d6 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchFieldLogDbm.java
@@ -120,12 +120,12 @@ public class SearchFieldLogDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSearchLogId = cci("searchLogId", "searchLogId", null, null, String.class, "searchLogId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnValue = cci("value", "value", null, null, String.class, "value", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnName() {
         return _columnName;
diff --git a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
index 684ae566a999eb5bfe6001264dfe89682c926bce..6c15a01ab3d667532a795dc564ebecd1594214b5 100644
--- a/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
+++ b/src/main/java/org/codelibs/fess/es/log/bsentity/dbmeta/SearchLogDbm.java
@@ -145,15 +145,15 @@ public class SearchLogDbm extends AbstractDBMeta {
     //                                                                         Column Info
     //                                                                         ===========
     protected final ColumnInfo _columnAccessType = cci("accessType", "accessType", null, null, String.class, "accessType", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "String", 0,
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnUser = cci("user", "user", null, null, String.class, "user", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryId = cci("queryId", "queryId", null, null, String.class, "queryId", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnClientIp = cci("clientIp", "clientIp", null, null, String.class, "clientIp", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHitCount = cci("hitCount", "hitCount", null, null, Long.class, "hitCount", null, false, false, false,
             "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnQueryOffset = cci("queryOffset", "queryOffset", null, null, Integer.class, "queryOffset", null,
@@ -161,7 +161,7 @@ public class SearchLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnQueryPageSize = cci("queryPageSize", "queryPageSize", null, null, Integer.class, "queryPageSize",
             null, false, false, false, "Integer", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnReferer = cci("referer", "referer", null, null, String.class, "referer", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRequestedAt = cci("requestedAt", "requestedAt", null, null, LocalDateTime.class, "requestedAt", null,
             false, false, false, "LocalDateTime", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnResponseTime = cci("responseTime", "responseTime", null, null, Long.class, "responseTime", null,
@@ -169,15 +169,15 @@ public class SearchLogDbm extends AbstractDBMeta {
     protected final ColumnInfo _columnQueryTime = cci("queryTime", "queryTime", null, null, Long.class, "queryTime", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSearchWord = cci("searchWord", "searchWord", null, null, String.class, "searchWord", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserAgent = cci("userAgent", "userAgent", null, null, String.class, "userAgent", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserInfoId = cci("userInfoId", "userInfoId", null, null, String.class, "userInfoId", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUserSessionId = cci("userSessionId", "userSessionId", null, null, String.class, "userSessionId",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLanguages = cci("languages", "languages", null, null, String.class, "languages", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnAccessType() {
         return _columnAccessType;
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
index ac35c8088df2d16036c85611741bb0578b174017..256bf9263d42bacdb8d5cc359101a7f4b4cd25f7 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsClickLogCA.java
@@ -21,28 +21,28 @@ import org.codelibs.fess.es.log.cbean.ca.ClickLogCA;
 import org.codelibs.fess.es.log.cbean.cq.ClickLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsClickLogCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -70,8 +70,8 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -94,37 +94,36 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // LocalDateTime queryRequestedAt
-
     public void setQueryRequestedAt_DateRange() {
         setQueryRequestedAt_DateRange(null);
     }
 
-    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, null);
     }
 
-    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryRequestedAt_DateRange("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setQueryRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda,
+    public void setQueryRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "queryRequestedAt");
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -139,17 +138,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryRequestedAt_DateHistogram(null);
     }
 
-    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, null);
     }
 
-    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryRequestedAt_DateHistogram("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setQueryRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setQueryRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "queryRequestedAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -164,12 +164,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryRequestedAt_Count(null);
     }
 
-    public void setQueryRequestedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryRequestedAt_Count("queryRequestedAt", opLambda);
     }
 
-    public void setQueryRequestedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryRequestedAt");
+    public void setQueryRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -179,12 +179,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryRequestedAt_Cardinality(null);
     }
 
-    public void setQueryRequestedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryRequestedAt_Cardinality("queryRequestedAt", opLambda);
     }
 
-    public void setQueryRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryRequestedAt");
+    public void setQueryRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -194,16 +194,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryRequestedAt_Missing(null);
     }
 
-    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryRequestedAt_Missing("queryRequestedAt", opLambda, null);
     }
 
-    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryRequestedAt_Missing("queryRequestedAt", opLambda, aggsLambda);
     }
 
-    public void setQueryRequestedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryRequestedAt");
+    public void setQueryRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryRequestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -214,22 +215,21 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // LocalDateTime requestedAt
-
     public void setRequestedAt_DateRange() {
         setRequestedAt_DateRange(null);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setRequestedAt_DateRange("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setRequestedAt_DateRange("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "requestedAt");
+    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -244,17 +244,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_DateHistogram(null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setRequestedAt_DateHistogram("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setRequestedAt_DateHistogram("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "requestedAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -269,12 +270,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Count(null);
     }
 
-    public void setRequestedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRequestedAt_Count("requestedAt", opLambda);
     }
 
-    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "requestedAt");
+    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,12 +285,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Cardinality(null);
     }
 
-    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRequestedAt_Cardinality("requestedAt", opLambda);
     }
 
-    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "requestedAt");
+    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -299,16 +300,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Missing(null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRequestedAt_Missing("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setRequestedAt_Missing("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "requestedAt");
+    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -319,22 +321,20 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String queryId
-
     public void setQueryId_Terms() {
         setQueryId_Terms(null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setQueryId_Terms("queryId", opLambda, null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryId_Terms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "queryId");
+    public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,17 +349,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryId_SignificantTerms(null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "queryId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -374,16 +375,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryId_IpRange(null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setQueryId_IpRange("queryId", opLambda, null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryId_IpRange("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "queryId");
+    public void setQueryId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -398,12 +400,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryId_Count(null);
     }
 
-    public void setQueryId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryId_Count("queryId", opLambda);
     }
 
-    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryId");
+    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -413,12 +415,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryId_Cardinality(null);
     }
 
-    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryId_Cardinality("queryId", opLambda);
     }
 
-    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryId");
+    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -428,16 +430,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setQueryId_Missing(null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryId_Missing("queryId", opLambda, null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setQueryId_Missing("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryId");
+    public void setQueryId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -448,22 +451,20 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String docId
-
     public void setDocId_Terms() {
         setDocId_Terms(null);
     }
 
-    public void setDocId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDocId_Terms("docId", opLambda, null);
     }
 
-    public void setDocId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setDocId_Terms("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "docId");
+    public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,17 +479,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setDocId_SignificantTerms(null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDocId_SignificantTerms("docId", opLambda, null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setDocId_SignificantTerms("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "docId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -503,16 +505,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setDocId_IpRange(null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDocId_IpRange("docId", opLambda, null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setDocId_IpRange("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "docId");
+    public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -527,12 +529,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setDocId_Count(null);
     }
 
-    public void setDocId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDocId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDocId_Count("docId", opLambda);
     }
 
-    public void setDocId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "docId");
+    public void setDocId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -542,12 +544,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setDocId_Cardinality(null);
     }
 
-    public void setDocId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDocId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDocId_Cardinality("docId", opLambda);
     }
 
-    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "docId");
+    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,16 +559,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setDocId_Missing(null);
     }
 
-    public void setDocId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDocId_Missing("docId", opLambda, null);
     }
 
-    public void setDocId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setDocId_Missing("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "docId");
+    public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -577,22 +579,21 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userSessionId
-
     public void setUserSessionId_Terms() {
         setUserSessionId_Terms(null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserSessionId_Terms("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUserSessionId_Terms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userSessionId");
+    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -607,18 +608,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_SignificantTerms(null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserSessionId_SignificantTerms("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
         setUserSessionId_SignificantTerms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userSessionId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -633,16 +634,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_IpRange(null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserSessionId_IpRange("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUserSessionId_IpRange("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userSessionId");
+    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -657,12 +659,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Count(null);
     }
 
-    public void setUserSessionId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserSessionId_Count("userSessionId", opLambda);
     }
 
-    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userSessionId");
+    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -672,12 +674,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Cardinality(null);
     }
 
-    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserSessionId_Cardinality("userSessionId", opLambda);
     }
 
-    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userSessionId");
+    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -687,16 +689,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Missing(null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserSessionId_Missing("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUserSessionId_Missing("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userSessionId");
+    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -707,22 +710,20 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String url
-
     public void setUrl_Terms() {
         setUrl_Terms(null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrl_Terms("url", opLambda, null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUrl_Terms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "url");
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -737,17 +738,18 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUrl_SignificantTerms(null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrl_SignificantTerms("url", opLambda, null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
         setUrl_SignificantTerms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsClickLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "url");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -762,16 +764,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUrl_IpRange(null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrl_IpRange("url", opLambda, null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUrl_IpRange("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "url");
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -786,12 +788,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUrl_Count(null);
     }
 
-    public void setUrl_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrl_Count("url", opLambda);
     }
 
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "url");
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -801,12 +803,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUrl_Cardinality(null);
     }
 
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrl_Cardinality("url", opLambda);
     }
 
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "url");
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -816,16 +818,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setUrl_Missing(null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrl_Missing("url", opLambda, null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setUrl_Missing("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "url");
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -836,17 +838,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer order
     public void setOrder_Avg() {
         setOrder_Avg(null);
     }
 
-    public void setOrder_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setOrder_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setOrder_Avg("order", opLambda);
     }
 
-    public void setOrder_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "order");
+    public void setOrder_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -856,12 +857,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Max(null);
     }
 
-    public void setOrder_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setOrder_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setOrder_Max("order", opLambda);
     }
 
-    public void setOrder_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "order");
+    public void setOrder_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -871,12 +872,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Min(null);
     }
 
-    public void setOrder_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setOrder_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setOrder_Min("order", opLambda);
     }
 
-    public void setOrder_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "order");
+    public void setOrder_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -886,12 +887,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Sum(null);
     }
 
-    public void setOrder_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setOrder_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setOrder_Sum("order", opLambda);
     }
 
-    public void setOrder_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "order");
+    public void setOrder_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -901,12 +902,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_ExtendedStats(null);
     }
 
-    public void setOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setOrder_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setOrder_ExtendedStats("order", opLambda);
     }
 
-    public void setOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "order");
+    public void setOrder_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,12 +917,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Stats(null);
     }
 
-    public void setOrder_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setOrder_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setOrder_Stats("order", opLambda);
     }
 
-    public void setOrder_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "order");
+    public void setOrder_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -931,12 +932,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Percentiles(null);
     }
 
-    public void setOrder_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setOrder_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setOrder_Percentiles("order", opLambda);
     }
 
-    public void setOrder_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "order");
+    public void setOrder_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -946,12 +947,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_PercentileRanks(null);
     }
 
-    public void setOrder_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setOrder_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setOrder_PercentileRanks("order", opLambda);
     }
 
-    public void setOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "order");
+    public void setOrder_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -961,16 +962,17 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Histogram(null);
     }
 
-    public void setOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setOrder_Histogram("order", opLambda, null);
     }
 
-    public void setOrder_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setOrder_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setOrder_Histogram("order", opLambda, aggsLambda);
     }
 
-    public void setOrder_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "order");
+    public void setOrder_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsClickLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -985,16 +987,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Range(null);
     }
 
-    public void setOrder_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setOrder_Range("order", opLambda, null);
     }
 
-    public void setOrder_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setOrder_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setOrder_Range("order", opLambda, aggsLambda);
     }
 
-    public void setOrder_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "order");
+    public void setOrder_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1009,12 +1011,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Count(null);
     }
 
-    public void setOrder_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setOrder_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setOrder_Count("order", opLambda);
     }
 
-    public void setOrder_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "order");
+    public void setOrder_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1024,12 +1026,12 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Cardinality(null);
     }
 
-    public void setOrder_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setOrder_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setOrder_Cardinality("order", opLambda);
     }
 
-    public void setOrder_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "order");
+    public void setOrder_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1039,16 +1041,16 @@ public abstract class BsClickLogCA extends EsAbstractConditionAggregation {
         setOrder_Missing(null);
     }
 
-    public void setOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setOrder_Missing("order", opLambda, null);
     }
 
-    public void setOrder_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+    public void setOrder_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
         setOrder_Missing("order", opLambda, aggsLambda);
     }
 
-    public void setOrder_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "order");
+    public void setOrder_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsClickLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "order");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
index 83eff1e136768836685cc1e08bbc8aba45a70383..256b41e9b3b41054615a11c9abad8eaa129c2c88 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsFavoriteLogCA.java
@@ -21,18 +21,18 @@ import org.codelibs.fess.es.log.cbean.ca.FavoriteLogCA;
 import org.codelibs.fess.es.log.cbean.cq.FavoriteLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsFavoriteLogCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -60,8 +60,8 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -84,36 +84,35 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // LocalDateTime createdAt
-
     public void setCreatedAt_DateRange() {
         setCreatedAt_DateRange(null);
     }
 
-    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setCreatedAt_DateRange("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setCreatedAt_DateRange("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "createdAt");
+    public void setCreatedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -128,17 +127,18 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setCreatedAt_DateHistogram(null);
     }
 
-    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setCreatedAt_DateHistogram("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setCreatedAt_DateHistogram("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setCreatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "createdAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -153,12 +153,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setCreatedAt_Count(null);
     }
 
-    public void setCreatedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedAt_Count("createdAt", opLambda);
     }
 
-    public void setCreatedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdAt");
+    public void setCreatedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -168,12 +168,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setCreatedAt_Cardinality(null);
     }
 
-    public void setCreatedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedAt_Cardinality("createdAt", opLambda);
     }
 
-    public void setCreatedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdAt");
+    public void setCreatedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -183,16 +183,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setCreatedAt_Missing(null);
     }
 
-    public void setCreatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedAt_Missing("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setCreatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setCreatedAt_Missing("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdAt");
+    public void setCreatedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -203,22 +204,20 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String url
-
     public void setUrl_Terms() {
         setUrl_Terms(null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUrl_Terms("url", opLambda, null);
     }
 
-    public void setUrl_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUrl_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUrl_Terms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "url");
+    public void setUrl_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -233,17 +232,18 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUrl_SignificantTerms(null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUrl_SignificantTerms("url", opLambda, null);
     }
 
-    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUrl_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUrl_SignificantTerms("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUrl_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "url");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -258,16 +258,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUrl_IpRange(null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUrl_IpRange("url", opLambda, null);
     }
 
-    public void setUrl_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUrl_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUrl_IpRange("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "url");
+    public void setUrl_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -282,12 +283,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUrl_Count(null);
     }
 
-    public void setUrl_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUrl_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUrl_Count("url", opLambda);
     }
 
-    public void setUrl_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "url");
+    public void setUrl_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -297,12 +298,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUrl_Cardinality(null);
     }
 
-    public void setUrl_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUrl_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUrl_Cardinality("url", opLambda);
     }
 
-    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "url");
+    public void setUrl_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,16 +313,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUrl_Missing(null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUrl_Missing("url", opLambda, null);
     }
 
-    public void setUrl_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUrl_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUrl_Missing("url", opLambda, aggsLambda);
     }
 
-    public void setUrl_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "url");
+    public void setUrl_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "url");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -332,22 +334,20 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String docId
-
     public void setDocId_Terms() {
         setDocId_Terms(null);
     }
 
-    public void setDocId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDocId_Terms("docId", opLambda, null);
     }
 
-    public void setDocId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setDocId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setDocId_Terms("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "docId");
+    public void setDocId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -362,17 +362,18 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setDocId_SignificantTerms(null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDocId_SignificantTerms("docId", opLambda, null);
     }
 
-    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setDocId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setDocId_SignificantTerms("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDocId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "docId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -387,16 +388,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setDocId_IpRange(null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDocId_IpRange("docId", opLambda, null);
     }
 
-    public void setDocId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setDocId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setDocId_IpRange("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "docId");
+    public void setDocId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -411,12 +413,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setDocId_Count(null);
     }
 
-    public void setDocId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDocId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDocId_Count("docId", opLambda);
     }
 
-    public void setDocId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "docId");
+    public void setDocId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -426,12 +428,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setDocId_Cardinality(null);
     }
 
-    public void setDocId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDocId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDocId_Cardinality("docId", opLambda);
     }
 
-    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "docId");
+    public void setDocId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -441,16 +443,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setDocId_Missing(null);
     }
 
-    public void setDocId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDocId_Missing("docId", opLambda, null);
     }
 
-    public void setDocId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setDocId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setDocId_Missing("docId", opLambda, aggsLambda);
     }
 
-    public void setDocId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "docId");
+    public void setDocId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "docId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -461,22 +464,21 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String queryId
-
     public void setQueryId_Terms() {
         setQueryId_Terms(null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setQueryId_Terms("queryId", opLambda, null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setQueryId_Terms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "queryId");
+    public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -491,17 +493,18 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setQueryId_SignificantTerms(null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "queryId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -516,16 +519,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setQueryId_IpRange(null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setQueryId_IpRange("queryId", opLambda, null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setQueryId_IpRange("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "queryId");
+    public void setQueryId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -540,12 +544,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setQueryId_Count(null);
     }
 
-    public void setQueryId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryId_Count("queryId", opLambda);
     }
 
-    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryId");
+    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -555,12 +559,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setQueryId_Cardinality(null);
     }
 
-    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryId_Cardinality("queryId", opLambda);
     }
 
-    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryId");
+    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -570,16 +574,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setQueryId_Missing(null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryId_Missing("queryId", opLambda, null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setQueryId_Missing("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryId");
+    public void setQueryId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -590,22 +595,21 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userInfoId
-
     public void setUserInfoId_Terms() {
         setUserInfoId_Terms(null);
     }
 
-    public void setUserInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserInfoId_Terms("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUserInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUserInfoId_Terms("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userInfoId");
+    public void setUserInfoId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -620,18 +624,18 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_SignificantTerms(null);
     }
 
-    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserInfoId_SignificantTerms("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUserInfoId_SignificantTerms("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userInfoId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -646,16 +650,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_IpRange(null);
     }
 
-    public void setUserInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserInfoId_IpRange("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUserInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUserInfoId_IpRange("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userInfoId");
+    public void setUserInfoId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -670,12 +675,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Count(null);
     }
 
-    public void setUserInfoId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserInfoId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserInfoId_Count("userInfoId", opLambda);
     }
 
-    public void setUserInfoId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userInfoId");
+    public void setUserInfoId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -685,12 +690,12 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Cardinality(null);
     }
 
-    public void setUserInfoId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserInfoId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserInfoId_Cardinality("userInfoId", opLambda);
     }
 
-    public void setUserInfoId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userInfoId");
+    public void setUserInfoId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -700,16 +705,17 @@ public abstract class BsFavoriteLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Missing(null);
     }
 
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserInfoId_Missing("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
+    public void setUserInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
         setUserInfoId_Missing("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsFavoriteLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userInfoId");
+    public void setUserInfoId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsFavoriteLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchFieldLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchFieldLogCA.java
index f759614e364cd3352985ec41250e78df8ea56e51..e03c32ad554825cb276abe751c79f7a14af8f15f 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchFieldLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchFieldLogCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.log.cbean.ca.SearchFieldLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchFieldLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchFieldLogCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,35 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,17 +125,18 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -151,16 +151,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -175,12 +176,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -190,12 +191,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -205,16 +206,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -225,22 +227,21 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String searchLogId
-
     public void setSearchLogId_Terms() {
         setSearchLogId_Terms(null);
     }
 
-    public void setSearchLogId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSearchLogId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSearchLogId_Terms("searchLogId", opLambda, null);
     }
 
-    public void setSearchLogId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setSearchLogId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setSearchLogId_Terms("searchLogId", opLambda, aggsLambda);
     }
 
-    public void setSearchLogId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "searchLogId");
+    public void setSearchLogId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,18 +256,18 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setSearchLogId_SignificantTerms(null);
     }
 
-    public void setSearchLogId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSearchLogId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSearchLogId_SignificantTerms("searchLogId", opLambda, null);
     }
 
-    public void setSearchLogId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSearchLogId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setSearchLogId_SignificantTerms("searchLogId", opLambda, aggsLambda);
     }
 
-    public void setSearchLogId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSearchLogId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "searchLogId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -281,17 +282,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setSearchLogId_IpRange(null);
     }
 
-    public void setSearchLogId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSearchLogId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSearchLogId_IpRange("searchLogId", opLambda, null);
     }
 
-    public void setSearchLogId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setSearchLogId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setSearchLogId_IpRange("searchLogId", opLambda, aggsLambda);
     }
 
-    public void setSearchLogId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setSearchLogId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "searchLogId");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,12 +307,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setSearchLogId_Count(null);
     }
 
-    public void setSearchLogId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSearchLogId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSearchLogId_Count("searchLogId", opLambda);
     }
 
-    public void setSearchLogId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "searchLogId");
+    public void setSearchLogId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -321,12 +322,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setSearchLogId_Cardinality(null);
     }
 
-    public void setSearchLogId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSearchLogId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSearchLogId_Cardinality("searchLogId", opLambda);
     }
 
-    public void setSearchLogId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "searchLogId");
+    public void setSearchLogId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -336,17 +337,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setSearchLogId_Missing(null);
     }
 
-    public void setSearchLogId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSearchLogId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSearchLogId_Missing("searchLogId", opLambda, null);
     }
 
-    public void setSearchLogId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setSearchLogId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setSearchLogId_Missing("searchLogId", opLambda, aggsLambda);
     }
 
-    public void setSearchLogId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setSearchLogId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "searchLogId");
+        MissingAggregationBuilder builder = regMissingA(name, "searchLogId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -357,22 +358,21 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         }
     }
 
-    // String value
-
     public void setValue_Terms() {
         setValue_Terms(null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setValue_Terms("value", opLambda, null);
     }
 
-    public void setValue_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setValue_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setValue_Terms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "value");
+    public void setValue_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -387,17 +387,18 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setValue_SignificantTerms(null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setValue_SignificantTerms("value", opLambda, null);
     }
 
-    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setValue_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setValue_SignificantTerms("value", opLambda, aggsLambda);
     }
 
-    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setValue_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "value");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -412,16 +413,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setValue_IpRange(null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setValue_IpRange("value", opLambda, null);
     }
 
-    public void setValue_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setValue_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setValue_IpRange("value", opLambda, aggsLambda);
     }
 
-    public void setValue_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "value");
+    public void setValue_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -436,12 +438,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setValue_Count(null);
     }
 
-    public void setValue_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setValue_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setValue_Count("value", opLambda);
     }
 
-    public void setValue_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "value");
+    public void setValue_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -451,12 +453,12 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setValue_Cardinality(null);
     }
 
-    public void setValue_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setValue_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setValue_Cardinality("value", opLambda);
     }
 
-    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "value");
+    public void setValue_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -466,16 +468,17 @@ public abstract class BsSearchFieldLogCA extends EsAbstractConditionAggregation
         setValue_Missing(null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setValue_Missing("value", opLambda, null);
     }
 
-    public void setValue_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+    public void setValue_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
         setValue_Missing("value", opLambda, aggsLambda);
     }
 
-    public void setValue_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchFieldLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "value");
+    public void setValue_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchFieldLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "value");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
index c314b4ebeeb4a3a6259970f87d17a22cfed85221..6e17ef8a80a747d1983d20b13220e4b091c74f70 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsSearchLogCA.java
@@ -21,28 +21,28 @@ import org.codelibs.fess.es.log.cbean.ca.SearchLogCA;
 import org.codelibs.fess.es.log.cbean.cq.SearchLogCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsSearchLogCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -70,8 +70,8 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -94,36 +94,35 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String accessType
-
     public void setAccessType_Terms() {
         setAccessType_Terms(null);
     }
 
-    public void setAccessType_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setAccessType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setAccessType_Terms("accessType", opLambda, null);
     }
 
-    public void setAccessType_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setAccessType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setAccessType_Terms("accessType", opLambda, aggsLambda);
     }
 
-    public void setAccessType_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "accessType");
+    public void setAccessType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -138,17 +137,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setAccessType_SignificantTerms(null);
     }
 
-    public void setAccessType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setAccessType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setAccessType_SignificantTerms("accessType", opLambda, null);
     }
 
-    public void setAccessType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setAccessType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setAccessType_SignificantTerms("accessType", opLambda, aggsLambda);
     }
 
-    public void setAccessType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setAccessType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "accessType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -163,16 +163,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setAccessType_IpRange(null);
     }
 
-    public void setAccessType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setAccessType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setAccessType_IpRange("accessType", opLambda, null);
     }
 
-    public void setAccessType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setAccessType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setAccessType_IpRange("accessType", opLambda, aggsLambda);
     }
 
-    public void setAccessType_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "accessType");
+    public void setAccessType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -187,12 +188,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setAccessType_Count(null);
     }
 
-    public void setAccessType_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setAccessType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setAccessType_Count("accessType", opLambda);
     }
 
-    public void setAccessType_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "accessType");
+    public void setAccessType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -202,12 +203,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setAccessType_Cardinality(null);
     }
 
-    public void setAccessType_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setAccessType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setAccessType_Cardinality("accessType", opLambda);
     }
 
-    public void setAccessType_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "accessType");
+    public void setAccessType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -217,16 +218,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setAccessType_Missing(null);
     }
 
-    public void setAccessType_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setAccessType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setAccessType_Missing("accessType", opLambda, null);
     }
 
-    public void setAccessType_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setAccessType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setAccessType_Missing("accessType", opLambda, aggsLambda);
     }
 
-    public void setAccessType_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "accessType");
+    public void setAccessType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "accessType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -237,22 +239,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String user
-
     public void setUser_Terms() {
         setUser_Terms(null);
     }
 
-    public void setUser_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUser_Terms("user", opLambda, null);
     }
 
-    public void setUser_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUser_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUser_Terms("user", opLambda, aggsLambda);
     }
 
-    public void setUser_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "user");
+    public void setUser_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -267,17 +267,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUser_SignificantTerms(null);
     }
 
-    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUser_SignificantTerms("user", opLambda, null);
     }
 
-    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUser_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setUser_SignificantTerms("user", opLambda, aggsLambda);
     }
 
-    public void setUser_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUser_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "user");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -292,16 +293,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUser_IpRange(null);
     }
 
-    public void setUser_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUser_IpRange("user", opLambda, null);
     }
 
-    public void setUser_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUser_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUser_IpRange("user", opLambda, aggsLambda);
     }
 
-    public void setUser_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "user");
+    public void setUser_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,12 +317,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUser_Count(null);
     }
 
-    public void setUser_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUser_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUser_Count("user", opLambda);
     }
 
-    public void setUser_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "user");
+    public void setUser_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -331,12 +332,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUser_Cardinality(null);
     }
 
-    public void setUser_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUser_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUser_Cardinality("user", opLambda);
     }
 
-    public void setUser_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "user");
+    public void setUser_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -346,16 +347,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUser_Missing(null);
     }
 
-    public void setUser_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUser_Missing("user", opLambda, null);
     }
 
-    public void setUser_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUser_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUser_Missing("user", opLambda, aggsLambda);
     }
 
-    public void setUser_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "user");
+    public void setUser_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "user");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -366,22 +367,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String roles
-
     public void setRoles_Terms() {
         setRoles_Terms(null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoles_Terms("roles", opLambda, null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setRoles_Terms("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roles");
+    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -396,17 +395,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRoles_SignificantTerms(null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoles_SignificantTerms("roles", opLambda, null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setRoles_SignificantTerms("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roles");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -421,16 +421,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRoles_IpRange(null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoles_IpRange("roles", opLambda, null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setRoles_IpRange("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roles");
+    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -445,12 +446,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRoles_Count(null);
     }
 
-    public void setRoles_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoles_Count("roles", opLambda);
     }
 
-    public void setRoles_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roles");
+    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -460,12 +461,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRoles_Cardinality(null);
     }
 
-    public void setRoles_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoles_Cardinality("roles", opLambda);
     }
 
-    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roles");
+    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -475,16 +476,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRoles_Missing(null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoles_Missing("roles", opLambda, null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setRoles_Missing("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roles");
+    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -495,22 +497,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String queryId
-
     public void setQueryId_Terms() {
         setQueryId_Terms(null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setQueryId_Terms("queryId", opLambda, null);
     }
 
-    public void setQueryId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryId_Terms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "queryId");
+    public void setQueryId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -525,17 +525,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryId_SignificantTerms(null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, null);
     }
 
-    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryId_SignificantTerms("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setQueryId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "queryId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -550,16 +551,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryId_IpRange(null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setQueryId_IpRange("queryId", opLambda, null);
     }
 
-    public void setQueryId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryId_IpRange("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "queryId");
+    public void setQueryId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -574,12 +576,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryId_Count(null);
     }
 
-    public void setQueryId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryId_Count("queryId", opLambda);
     }
 
-    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryId");
+    public void setQueryId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -589,12 +591,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryId_Cardinality(null);
     }
 
-    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryId_Cardinality("queryId", opLambda);
     }
 
-    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryId");
+    public void setQueryId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -604,16 +606,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryId_Missing(null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryId_Missing("queryId", opLambda, null);
     }
 
-    public void setQueryId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryId_Missing("queryId", opLambda, aggsLambda);
     }
 
-    public void setQueryId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryId");
+    public void setQueryId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -624,22 +627,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String clientIp
-
     public void setClientIp_Terms() {
         setClientIp_Terms(null);
     }
 
-    public void setClientIp_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setClientIp_Terms("clientIp", opLambda, null);
     }
 
-    public void setClientIp_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setClientIp_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setClientIp_Terms("clientIp", opLambda, aggsLambda);
     }
 
-    public void setClientIp_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "clientIp");
+    public void setClientIp_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -654,17 +655,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setClientIp_SignificantTerms(null);
     }
 
-    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setClientIp_SignificantTerms("clientIp", opLambda, null);
     }
 
-    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setClientIp_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setClientIp_SignificantTerms("clientIp", opLambda, aggsLambda);
     }
 
-    public void setClientIp_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setClientIp_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "clientIp");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -679,16 +681,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setClientIp_IpRange(null);
     }
 
-    public void setClientIp_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setClientIp_IpRange("clientIp", opLambda, null);
     }
 
-    public void setClientIp_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setClientIp_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setClientIp_IpRange("clientIp", opLambda, aggsLambda);
     }
 
-    public void setClientIp_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "clientIp");
+    public void setClientIp_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -703,12 +706,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setClientIp_Count(null);
     }
 
-    public void setClientIp_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setClientIp_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setClientIp_Count("clientIp", opLambda);
     }
 
-    public void setClientIp_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "clientIp");
+    public void setClientIp_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -718,12 +721,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setClientIp_Cardinality(null);
     }
 
-    public void setClientIp_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setClientIp_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setClientIp_Cardinality("clientIp", opLambda);
     }
 
-    public void setClientIp_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "clientIp");
+    public void setClientIp_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -733,16 +736,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setClientIp_Missing(null);
     }
 
-    public void setClientIp_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setClientIp_Missing("clientIp", opLambda, null);
     }
 
-    public void setClientIp_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setClientIp_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setClientIp_Missing("clientIp", opLambda, aggsLambda);
     }
 
-    public void setClientIp_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "clientIp");
+    public void setClientIp_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "clientIp");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -753,17 +757,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long hitCount
     public void setHitCount_Avg() {
         setHitCount_Avg(null);
     }
 
-    public void setHitCount_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setHitCount_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setHitCount_Avg("hitCount", opLambda);
     }
 
-    public void setHitCount_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "hitCount");
+    public void setHitCount_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -773,12 +776,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Max(null);
     }
 
-    public void setHitCount_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setHitCount_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setHitCount_Max("hitCount", opLambda);
     }
 
-    public void setHitCount_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "hitCount");
+    public void setHitCount_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -788,12 +791,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Min(null);
     }
 
-    public void setHitCount_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setHitCount_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setHitCount_Min("hitCount", opLambda);
     }
 
-    public void setHitCount_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "hitCount");
+    public void setHitCount_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -803,12 +806,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Sum(null);
     }
 
-    public void setHitCount_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setHitCount_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setHitCount_Sum("hitCount", opLambda);
     }
 
-    public void setHitCount_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "hitCount");
+    public void setHitCount_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -818,12 +821,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_ExtendedStats(null);
     }
 
-    public void setHitCount_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setHitCount_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setHitCount_ExtendedStats("hitCount", opLambda);
     }
 
-    public void setHitCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "hitCount");
+    public void setHitCount_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -833,12 +836,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Stats(null);
     }
 
-    public void setHitCount_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setHitCount_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setHitCount_Stats("hitCount", opLambda);
     }
 
-    public void setHitCount_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "hitCount");
+    public void setHitCount_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -848,12 +851,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Percentiles(null);
     }
 
-    public void setHitCount_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setHitCount_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setHitCount_Percentiles("hitCount", opLambda);
     }
 
-    public void setHitCount_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "hitCount");
+    public void setHitCount_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -863,12 +866,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_PercentileRanks(null);
     }
 
-    public void setHitCount_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setHitCount_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setHitCount_PercentileRanks("hitCount", opLambda);
     }
 
-    public void setHitCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "hitCount");
+    public void setHitCount_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -878,16 +881,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Histogram(null);
     }
 
-    public void setHitCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setHitCount_Histogram("hitCount", opLambda, null);
     }
 
-    public void setHitCount_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setHitCount_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setHitCount_Histogram("hitCount", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "hitCount");
+    public void setHitCount_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -902,16 +906,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Range(null);
     }
 
-    public void setHitCount_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setHitCount_Range("hitCount", opLambda, null);
     }
 
-    public void setHitCount_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setHitCount_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setHitCount_Range("hitCount", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "hitCount");
+    public void setHitCount_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -926,12 +930,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Count(null);
     }
 
-    public void setHitCount_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHitCount_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHitCount_Count("hitCount", opLambda);
     }
 
-    public void setHitCount_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "hitCount");
+    public void setHitCount_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -941,12 +945,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Cardinality(null);
     }
 
-    public void setHitCount_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHitCount_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHitCount_Cardinality("hitCount", opLambda);
     }
 
-    public void setHitCount_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "hitCount");
+    public void setHitCount_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -956,16 +960,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setHitCount_Missing(null);
     }
 
-    public void setHitCount_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHitCount_Missing("hitCount", opLambda, null);
     }
 
-    public void setHitCount_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setHitCount_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setHitCount_Missing("hitCount", opLambda, aggsLambda);
     }
 
-    public void setHitCount_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "hitCount");
+    public void setHitCount_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "hitCount");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -976,17 +981,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer queryOffset
     public void setQueryOffset_Avg() {
         setQueryOffset_Avg(null);
     }
 
-    public void setQueryOffset_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setQueryOffset_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setQueryOffset_Avg("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "queryOffset");
+    public void setQueryOffset_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -996,12 +1000,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Max(null);
     }
 
-    public void setQueryOffset_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setQueryOffset_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setQueryOffset_Max("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "queryOffset");
+    public void setQueryOffset_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1011,12 +1015,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Min(null);
     }
 
-    public void setQueryOffset_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setQueryOffset_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setQueryOffset_Min("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "queryOffset");
+    public void setQueryOffset_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1026,12 +1030,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Sum(null);
     }
 
-    public void setQueryOffset_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setQueryOffset_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setQueryOffset_Sum("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "queryOffset");
+    public void setQueryOffset_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1041,12 +1045,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_ExtendedStats(null);
     }
 
-    public void setQueryOffset_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setQueryOffset_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setQueryOffset_ExtendedStats("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "queryOffset");
+    public void setQueryOffset_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,12 +1060,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Stats(null);
     }
 
-    public void setQueryOffset_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setQueryOffset_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setQueryOffset_Stats("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "queryOffset");
+    public void setQueryOffset_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1071,12 +1075,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Percentiles(null);
     }
 
-    public void setQueryOffset_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setQueryOffset_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setQueryOffset_Percentiles("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "queryOffset");
+    public void setQueryOffset_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1086,12 +1090,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_PercentileRanks(null);
     }
 
-    public void setQueryOffset_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setQueryOffset_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setQueryOffset_PercentileRanks("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "queryOffset");
+    public void setQueryOffset_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1101,16 +1105,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Histogram(null);
     }
 
-    public void setQueryOffset_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setQueryOffset_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setQueryOffset_Histogram("queryOffset", opLambda, null);
     }
 
-    public void setQueryOffset_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryOffset_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryOffset_Histogram("queryOffset", opLambda, aggsLambda);
     }
 
-    public void setQueryOffset_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "queryOffset");
+    public void setQueryOffset_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1125,16 +1130,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Range(null);
     }
 
-    public void setQueryOffset_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setQueryOffset_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setQueryOffset_Range("queryOffset", opLambda, null);
     }
 
-    public void setQueryOffset_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryOffset_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryOffset_Range("queryOffset", opLambda, aggsLambda);
     }
 
-    public void setQueryOffset_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "queryOffset");
+    public void setQueryOffset_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1149,12 +1155,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Count(null);
     }
 
-    public void setQueryOffset_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryOffset_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryOffset_Count("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryOffset");
+    public void setQueryOffset_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1164,12 +1170,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Cardinality(null);
     }
 
-    public void setQueryOffset_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryOffset_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryOffset_Cardinality("queryOffset", opLambda);
     }
 
-    public void setQueryOffset_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryOffset");
+    public void setQueryOffset_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1179,16 +1185,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryOffset_Missing(null);
     }
 
-    public void setQueryOffset_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryOffset_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryOffset_Missing("queryOffset", opLambda, null);
     }
 
-    public void setQueryOffset_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryOffset_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryOffset_Missing("queryOffset", opLambda, aggsLambda);
     }
 
-    public void setQueryOffset_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryOffset");
+    public void setQueryOffset_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryOffset");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1199,17 +1206,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Integer queryPageSize
     public void setQueryPageSize_Avg() {
         setQueryPageSize_Avg(null);
     }
 
-    public void setQueryPageSize_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setQueryPageSize_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setQueryPageSize_Avg("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "queryPageSize");
+    public void setQueryPageSize_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1219,12 +1225,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Max(null);
     }
 
-    public void setQueryPageSize_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setQueryPageSize_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setQueryPageSize_Max("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "queryPageSize");
+    public void setQueryPageSize_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1234,12 +1240,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Min(null);
     }
 
-    public void setQueryPageSize_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setQueryPageSize_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setQueryPageSize_Min("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "queryPageSize");
+    public void setQueryPageSize_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1249,12 +1255,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Sum(null);
     }
 
-    public void setQueryPageSize_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setQueryPageSize_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setQueryPageSize_Sum("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "queryPageSize");
+    public void setQueryPageSize_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1264,12 +1270,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_ExtendedStats(null);
     }
 
-    public void setQueryPageSize_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setQueryPageSize_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setQueryPageSize_ExtendedStats("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "queryPageSize");
+    public void setQueryPageSize_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1279,12 +1285,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Stats(null);
     }
 
-    public void setQueryPageSize_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setQueryPageSize_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setQueryPageSize_Stats("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "queryPageSize");
+    public void setQueryPageSize_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1294,12 +1300,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Percentiles(null);
     }
 
-    public void setQueryPageSize_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setQueryPageSize_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setQueryPageSize_Percentiles("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "queryPageSize");
+    public void setQueryPageSize_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1309,12 +1315,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_PercentileRanks(null);
     }
 
-    public void setQueryPageSize_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setQueryPageSize_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setQueryPageSize_PercentileRanks("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "queryPageSize");
+    public void setQueryPageSize_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1324,17 +1330,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Histogram(null);
     }
 
-    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setQueryPageSize_Histogram("queryPageSize", opLambda, null);
     }
 
-    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryPageSize_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryPageSize_Histogram("queryPageSize", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setQueryPageSize_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "queryPageSize");
+        HistogramAggregationBuilder builder = regHistogramA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1349,16 +1355,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Range(null);
     }
 
-    public void setQueryPageSize_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setQueryPageSize_Range("queryPageSize", opLambda, null);
     }
 
-    public void setQueryPageSize_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryPageSize_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryPageSize_Range("queryPageSize", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "queryPageSize");
+    public void setQueryPageSize_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1373,12 +1380,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Count(null);
     }
 
-    public void setQueryPageSize_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryPageSize_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryPageSize_Count("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryPageSize");
+    public void setQueryPageSize_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1388,12 +1395,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Cardinality(null);
     }
 
-    public void setQueryPageSize_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryPageSize_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryPageSize_Cardinality("queryPageSize", opLambda);
     }
 
-    public void setQueryPageSize_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryPageSize");
+    public void setQueryPageSize_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1403,16 +1410,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryPageSize_Missing(null);
     }
 
-    public void setQueryPageSize_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryPageSize_Missing("queryPageSize", opLambda, null);
     }
 
-    public void setQueryPageSize_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryPageSize_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryPageSize_Missing("queryPageSize", opLambda, aggsLambda);
     }
 
-    public void setQueryPageSize_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryPageSize");
+    public void setQueryPageSize_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryPageSize");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1423,22 +1431,20 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String referer
-
     public void setReferer_Terms() {
         setReferer_Terms(null);
     }
 
-    public void setReferer_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setReferer_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setReferer_Terms("referer", opLambda, null);
     }
 
-    public void setReferer_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setReferer_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setReferer_Terms("referer", opLambda, aggsLambda);
     }
 
-    public void setReferer_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "referer");
+    public void setReferer_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1453,17 +1459,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setReferer_SignificantTerms(null);
     }
 
-    public void setReferer_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setReferer_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setReferer_SignificantTerms("referer", opLambda, null);
     }
 
-    public void setReferer_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setReferer_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setReferer_SignificantTerms("referer", opLambda, aggsLambda);
     }
 
-    public void setReferer_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setReferer_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "referer");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1478,16 +1485,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setReferer_IpRange(null);
     }
 
-    public void setReferer_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setReferer_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setReferer_IpRange("referer", opLambda, null);
     }
 
-    public void setReferer_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setReferer_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setReferer_IpRange("referer", opLambda, aggsLambda);
     }
 
-    public void setReferer_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "referer");
+    public void setReferer_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1502,12 +1510,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setReferer_Count(null);
     }
 
-    public void setReferer_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setReferer_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setReferer_Count("referer", opLambda);
     }
 
-    public void setReferer_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "referer");
+    public void setReferer_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1517,12 +1525,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setReferer_Cardinality(null);
     }
 
-    public void setReferer_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setReferer_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setReferer_Cardinality("referer", opLambda);
     }
 
-    public void setReferer_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "referer");
+    public void setReferer_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1532,16 +1540,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setReferer_Missing(null);
     }
 
-    public void setReferer_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setReferer_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setReferer_Missing("referer", opLambda, null);
     }
 
-    public void setReferer_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setReferer_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setReferer_Missing("referer", opLambda, aggsLambda);
     }
 
-    public void setReferer_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "referer");
+    public void setReferer_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "referer");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1552,22 +1561,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // LocalDateTime requestedAt
-
     public void setRequestedAt_DateRange() {
         setRequestedAt_DateRange(null);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setRequestedAt_DateRange("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRequestedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setRequestedAt_DateRange("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "requestedAt");
+    public void setRequestedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1582,17 +1590,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_DateHistogram(null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setRequestedAt_DateHistogram("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRequestedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setRequestedAt_DateHistogram("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setRequestedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "requestedAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1607,12 +1616,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Count(null);
     }
 
-    public void setRequestedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRequestedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRequestedAt_Count("requestedAt", opLambda);
     }
 
-    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "requestedAt");
+    public void setRequestedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1622,12 +1631,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Cardinality(null);
     }
 
-    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRequestedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRequestedAt_Cardinality("requestedAt", opLambda);
     }
 
-    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "requestedAt");
+    public void setRequestedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1637,16 +1646,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setRequestedAt_Missing(null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRequestedAt_Missing("requestedAt", opLambda, null);
     }
 
-    public void setRequestedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setRequestedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setRequestedAt_Missing("requestedAt", opLambda, aggsLambda);
     }
 
-    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "requestedAt");
+    public void setRequestedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "requestedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1657,17 +1667,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long responseTime
     public void setResponseTime_Avg() {
         setResponseTime_Avg(null);
     }
 
-    public void setResponseTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setResponseTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setResponseTime_Avg("responseTime", opLambda);
     }
 
-    public void setResponseTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "responseTime");
+    public void setResponseTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1677,12 +1686,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Max(null);
     }
 
-    public void setResponseTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setResponseTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setResponseTime_Max("responseTime", opLambda);
     }
 
-    public void setResponseTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "responseTime");
+    public void setResponseTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1692,12 +1701,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Min(null);
     }
 
-    public void setResponseTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setResponseTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setResponseTime_Min("responseTime", opLambda);
     }
 
-    public void setResponseTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "responseTime");
+    public void setResponseTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1707,12 +1716,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Sum(null);
     }
 
-    public void setResponseTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setResponseTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setResponseTime_Sum("responseTime", opLambda);
     }
 
-    public void setResponseTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "responseTime");
+    public void setResponseTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1722,12 +1731,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_ExtendedStats(null);
     }
 
-    public void setResponseTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setResponseTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setResponseTime_ExtendedStats("responseTime", opLambda);
     }
 
-    public void setResponseTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "responseTime");
+    public void setResponseTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1737,12 +1746,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Stats(null);
     }
 
-    public void setResponseTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setResponseTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setResponseTime_Stats("responseTime", opLambda);
     }
 
-    public void setResponseTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "responseTime");
+    public void setResponseTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1752,12 +1761,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Percentiles(null);
     }
 
-    public void setResponseTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setResponseTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setResponseTime_Percentiles("responseTime", opLambda);
     }
 
-    public void setResponseTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "responseTime");
+    public void setResponseTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1767,12 +1776,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_PercentileRanks(null);
     }
 
-    public void setResponseTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setResponseTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setResponseTime_PercentileRanks("responseTime", opLambda);
     }
 
-    public void setResponseTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "responseTime");
+    public void setResponseTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1782,17 +1791,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Histogram(null);
     }
 
-    public void setResponseTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setResponseTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setResponseTime_Histogram("responseTime", opLambda, null);
     }
 
-    public void setResponseTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setResponseTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setResponseTime_Histogram("responseTime", opLambda, aggsLambda);
     }
 
-    public void setResponseTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda,
+    public void setResponseTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "responseTime");
+        HistogramAggregationBuilder builder = regHistogramA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1807,16 +1816,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Range(null);
     }
 
-    public void setResponseTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setResponseTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setResponseTime_Range("responseTime", opLambda, null);
     }
 
-    public void setResponseTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setResponseTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setResponseTime_Range("responseTime", opLambda, aggsLambda);
     }
 
-    public void setResponseTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "responseTime");
+    public void setResponseTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1831,12 +1841,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Count(null);
     }
 
-    public void setResponseTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setResponseTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setResponseTime_Count("responseTime", opLambda);
     }
 
-    public void setResponseTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "responseTime");
+    public void setResponseTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1846,12 +1856,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Cardinality(null);
     }
 
-    public void setResponseTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setResponseTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setResponseTime_Cardinality("responseTime", opLambda);
     }
 
-    public void setResponseTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "responseTime");
+    public void setResponseTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1861,16 +1871,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setResponseTime_Missing(null);
     }
 
-    public void setResponseTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setResponseTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setResponseTime_Missing("responseTime", opLambda, null);
     }
 
-    public void setResponseTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setResponseTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setResponseTime_Missing("responseTime", opLambda, aggsLambda);
     }
 
-    public void setResponseTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "responseTime");
+    public void setResponseTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "responseTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1881,17 +1892,16 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long queryTime
     public void setQueryTime_Avg() {
         setQueryTime_Avg(null);
     }
 
-    public void setQueryTime_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setQueryTime_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setQueryTime_Avg("queryTime", opLambda);
     }
 
-    public void setQueryTime_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "queryTime");
+    public void setQueryTime_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1901,12 +1911,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Max(null);
     }
 
-    public void setQueryTime_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setQueryTime_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setQueryTime_Max("queryTime", opLambda);
     }
 
-    public void setQueryTime_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "queryTime");
+    public void setQueryTime_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1916,12 +1926,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Min(null);
     }
 
-    public void setQueryTime_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setQueryTime_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setQueryTime_Min("queryTime", opLambda);
     }
 
-    public void setQueryTime_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "queryTime");
+    public void setQueryTime_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1931,12 +1941,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Sum(null);
     }
 
-    public void setQueryTime_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setQueryTime_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setQueryTime_Sum("queryTime", opLambda);
     }
 
-    public void setQueryTime_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "queryTime");
+    public void setQueryTime_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1946,12 +1956,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_ExtendedStats(null);
     }
 
-    public void setQueryTime_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setQueryTime_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setQueryTime_ExtendedStats("queryTime", opLambda);
     }
 
-    public void setQueryTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "queryTime");
+    public void setQueryTime_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1961,12 +1971,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Stats(null);
     }
 
-    public void setQueryTime_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setQueryTime_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setQueryTime_Stats("queryTime", opLambda);
     }
 
-    public void setQueryTime_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "queryTime");
+    public void setQueryTime_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1976,12 +1986,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Percentiles(null);
     }
 
-    public void setQueryTime_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setQueryTime_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setQueryTime_Percentiles("queryTime", opLambda);
     }
 
-    public void setQueryTime_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "queryTime");
+    public void setQueryTime_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1991,12 +2001,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_PercentileRanks(null);
     }
 
-    public void setQueryTime_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setQueryTime_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setQueryTime_PercentileRanks("queryTime", opLambda);
     }
 
-    public void setQueryTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "queryTime");
+    public void setQueryTime_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2006,16 +2016,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Histogram(null);
     }
 
-    public void setQueryTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setQueryTime_Histogram("queryTime", opLambda, null);
     }
 
-    public void setQueryTime_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryTime_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryTime_Histogram("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "queryTime");
+    public void setQueryTime_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2030,16 +2041,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Range(null);
     }
 
-    public void setQueryTime_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setQueryTime_Range("queryTime", opLambda, null);
     }
 
-    public void setQueryTime_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryTime_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryTime_Range("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "queryTime");
+    public void setQueryTime_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2054,12 +2066,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Count(null);
     }
 
-    public void setQueryTime_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setQueryTime_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setQueryTime_Count("queryTime", opLambda);
     }
 
-    public void setQueryTime_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "queryTime");
+    public void setQueryTime_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2069,12 +2081,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Cardinality(null);
     }
 
-    public void setQueryTime_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setQueryTime_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setQueryTime_Cardinality("queryTime", opLambda);
     }
 
-    public void setQueryTime_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "queryTime");
+    public void setQueryTime_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2084,16 +2096,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setQueryTime_Missing(null);
     }
 
-    public void setQueryTime_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setQueryTime_Missing("queryTime", opLambda, null);
     }
 
-    public void setQueryTime_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setQueryTime_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setQueryTime_Missing("queryTime", opLambda, aggsLambda);
     }
 
-    public void setQueryTime_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "queryTime");
+    public void setQueryTime_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "queryTime");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2104,22 +2117,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String searchWord
-
     public void setSearchWord_Terms() {
         setSearchWord_Terms(null);
     }
 
-    public void setSearchWord_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSearchWord_Terms("searchWord", opLambda, null);
     }
 
-    public void setSearchWord_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setSearchWord_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setSearchWord_Terms("searchWord", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "searchWord");
+    public void setSearchWord_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2134,17 +2146,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setSearchWord_SignificantTerms(null);
     }
 
-    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSearchWord_SignificantTerms("searchWord", opLambda, null);
     }
 
-    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setSearchWord_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setSearchWord_SignificantTerms("searchWord", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSearchWord_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "searchWord");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2159,16 +2172,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setSearchWord_IpRange(null);
     }
 
-    public void setSearchWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSearchWord_IpRange("searchWord", opLambda, null);
     }
 
-    public void setSearchWord_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setSearchWord_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setSearchWord_IpRange("searchWord", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "searchWord");
+    public void setSearchWord_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2183,12 +2197,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setSearchWord_Count(null);
     }
 
-    public void setSearchWord_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSearchWord_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSearchWord_Count("searchWord", opLambda);
     }
 
-    public void setSearchWord_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "searchWord");
+    public void setSearchWord_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2198,12 +2212,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setSearchWord_Cardinality(null);
     }
 
-    public void setSearchWord_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSearchWord_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSearchWord_Cardinality("searchWord", opLambda);
     }
 
-    public void setSearchWord_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "searchWord");
+    public void setSearchWord_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2213,16 +2227,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setSearchWord_Missing(null);
     }
 
-    public void setSearchWord_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSearchWord_Missing("searchWord", opLambda, null);
     }
 
-    public void setSearchWord_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setSearchWord_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setSearchWord_Missing("searchWord", opLambda, aggsLambda);
     }
 
-    public void setSearchWord_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "searchWord");
+    public void setSearchWord_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "searchWord");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2233,22 +2248,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userAgent
-
     public void setUserAgent_Terms() {
         setUserAgent_Terms(null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserAgent_Terms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserAgent_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserAgent_Terms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userAgent");
+    public void setUserAgent_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2263,17 +2277,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserAgent_SignificantTerms(null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserAgent_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserAgent_SignificantTerms("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserAgent_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userAgent");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2288,16 +2303,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserAgent_IpRange(null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserAgent_IpRange("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserAgent_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserAgent_IpRange("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userAgent");
+    public void setUserAgent_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2312,12 +2328,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserAgent_Count(null);
     }
 
-    public void setUserAgent_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserAgent_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserAgent_Count("userAgent", opLambda);
     }
 
-    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userAgent");
+    public void setUserAgent_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2327,12 +2343,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserAgent_Cardinality(null);
     }
 
-    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserAgent_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserAgent_Cardinality("userAgent", opLambda);
     }
 
-    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userAgent");
+    public void setUserAgent_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2342,16 +2358,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserAgent_Missing(null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserAgent_Missing("userAgent", opLambda, null);
     }
 
-    public void setUserAgent_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserAgent_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserAgent_Missing("userAgent", opLambda, aggsLambda);
     }
 
-    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userAgent");
+    public void setUserAgent_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userAgent");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2362,22 +2379,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userInfoId
-
     public void setUserInfoId_Terms() {
         setUserInfoId_Terms(null);
     }
 
-    public void setUserInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserInfoId_Terms("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserInfoId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserInfoId_Terms("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userInfoId");
+    public void setUserInfoId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2392,17 +2408,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_SignificantTerms(null);
     }
 
-    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserInfoId_SignificantTerms("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserInfoId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserInfoId_SignificantTerms("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserInfoId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userInfoId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2417,16 +2434,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_IpRange(null);
     }
 
-    public void setUserInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserInfoId_IpRange("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserInfoId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserInfoId_IpRange("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userInfoId");
+    public void setUserInfoId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2441,12 +2459,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Count(null);
     }
 
-    public void setUserInfoId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserInfoId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserInfoId_Count("userInfoId", opLambda);
     }
 
-    public void setUserInfoId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userInfoId");
+    public void setUserInfoId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2456,12 +2474,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Cardinality(null);
     }
 
-    public void setUserInfoId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserInfoId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserInfoId_Cardinality("userInfoId", opLambda);
     }
 
-    public void setUserInfoId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userInfoId");
+    public void setUserInfoId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2471,16 +2489,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserInfoId_Missing(null);
     }
 
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserInfoId_Missing("userInfoId", opLambda, null);
     }
 
-    public void setUserInfoId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserInfoId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserInfoId_Missing("userInfoId", opLambda, aggsLambda);
     }
 
-    public void setUserInfoId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userInfoId");
+    public void setUserInfoId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userInfoId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2491,22 +2510,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String userSessionId
-
     public void setUserSessionId_Terms() {
         setUserSessionId_Terms(null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setUserSessionId_Terms("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserSessionId_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserSessionId_Terms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "userSessionId");
+    public void setUserSessionId_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2521,18 +2539,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_SignificantTerms(null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setUserSessionId_SignificantTerms("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserSessionId_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserSessionId_SignificantTerms("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setUserSessionId_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "userSessionId");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2547,16 +2565,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_IpRange(null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setUserSessionId_IpRange("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserSessionId_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserSessionId_IpRange("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "userSessionId");
+    public void setUserSessionId_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2571,12 +2590,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Count(null);
     }
 
-    public void setUserSessionId_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUserSessionId_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUserSessionId_Count("userSessionId", opLambda);
     }
 
-    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "userSessionId");
+    public void setUserSessionId_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2586,12 +2605,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Cardinality(null);
     }
 
-    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUserSessionId_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUserSessionId_Cardinality("userSessionId", opLambda);
     }
 
-    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "userSessionId");
+    public void setUserSessionId_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2601,16 +2620,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setUserSessionId_Missing(null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUserSessionId_Missing("userSessionId", opLambda, null);
     }
 
-    public void setUserSessionId_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setUserSessionId_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setUserSessionId_Missing("userSessionId", opLambda, aggsLambda);
     }
 
-    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "userSessionId");
+    public void setUserSessionId_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "userSessionId");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2621,22 +2641,21 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String languages
-
     public void setLanguages_Terms() {
         setLanguages_Terms(null);
     }
 
-    public void setLanguages_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLanguages_Terms("languages", opLambda, null);
     }
 
-    public void setLanguages_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setLanguages_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setLanguages_Terms("languages", opLambda, aggsLambda);
     }
 
-    public void setLanguages_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "languages");
+    public void setLanguages_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2651,17 +2670,18 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setLanguages_SignificantTerms(null);
     }
 
-    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLanguages_SignificantTerms("languages", opLambda, null);
     }
 
-    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setLanguages_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
         setLanguages_SignificantTerms("languages", opLambda, aggsLambda);
     }
 
-    public void setLanguages_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLanguages_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsSearchLogCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "languages");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2676,16 +2696,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setLanguages_IpRange(null);
     }
 
-    public void setLanguages_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLanguages_IpRange("languages", opLambda, null);
     }
 
-    public void setLanguages_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setLanguages_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setLanguages_IpRange("languages", opLambda, aggsLambda);
     }
 
-    public void setLanguages_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "languages");
+    public void setLanguages_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2700,12 +2721,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setLanguages_Count(null);
     }
 
-    public void setLanguages_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLanguages_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLanguages_Count("languages", opLambda);
     }
 
-    public void setLanguages_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "languages");
+    public void setLanguages_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2715,12 +2736,12 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setLanguages_Cardinality(null);
     }
 
-    public void setLanguages_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLanguages_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLanguages_Cardinality("languages", opLambda);
     }
 
-    public void setLanguages_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "languages");
+    public void setLanguages_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2730,16 +2751,17 @@ public abstract class BsSearchLogCA extends EsAbstractConditionAggregation {
         setLanguages_Missing(null);
     }
 
-    public void setLanguages_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLanguages_Missing("languages", opLambda, null);
     }
 
-    public void setLanguages_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
+    public void setLanguages_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
         setLanguages_Missing("languages", opLambda, aggsLambda);
     }
 
-    public void setLanguages_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsSearchLogCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "languages");
+    public void setLanguages_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsSearchLogCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "languages");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
index 0caeda7d3f7e066b3ba2bcff60b3378a7c8acff4..d141cebb45c99e7a7bf24e70bd7c5a1677d4e8fd 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/ca/bs/BsUserInfoCA.java
@@ -21,15 +21,15 @@ import org.codelibs.fess.es.log.cbean.ca.UserInfoCA;
 import org.codelibs.fess.es.log.cbean.cq.UserInfoCQ;
 import org.codelibs.fess.es.log.cbean.cq.bs.BsUserInfoCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -57,8 +57,8 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -81,36 +81,35 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // LocalDateTime createdAt
-
     public void setCreatedAt_DateRange() {
         setCreatedAt_DateRange(null);
     }
 
-    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setCreatedAt_DateRange("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setCreatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
         setCreatedAt_DateRange("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "createdAt");
+    public void setCreatedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -125,17 +124,18 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setCreatedAt_DateHistogram(null);
     }
 
-    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setCreatedAt_DateHistogram("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setCreatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
         setCreatedAt_DateHistogram("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setCreatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsUserInfoCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "createdAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -150,12 +150,12 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setCreatedAt_Count(null);
     }
 
-    public void setCreatedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCreatedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCreatedAt_Count("createdAt", opLambda);
     }
 
-    public void setCreatedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "createdAt");
+    public void setCreatedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -165,12 +165,12 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setCreatedAt_Cardinality(null);
     }
 
-    public void setCreatedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCreatedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCreatedAt_Cardinality("createdAt", opLambda);
     }
 
-    public void setCreatedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "createdAt");
+    public void setCreatedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -180,16 +180,17 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setCreatedAt_Missing(null);
     }
 
-    public void setCreatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCreatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCreatedAt_Missing("createdAt", opLambda, null);
     }
 
-    public void setCreatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setCreatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
         setCreatedAt_Missing("createdAt", opLambda, aggsLambda);
     }
 
-    public void setCreatedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "createdAt");
+    public void setCreatedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "createdAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,22 +201,21 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // LocalDateTime updatedAt
-
     public void setUpdatedAt_DateRange() {
         setUpdatedAt_DateRange(null);
     }
 
-    public void setUpdatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda) {
+    public void setUpdatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda) {
         setUpdatedAt_DateRange("updatedAt", opLambda, null);
     }
 
-    public void setUpdatedAt_DateRange(ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setUpdatedAt_DateRange(ConditionOptionCall<DateRangeAggregationBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
         setUpdatedAt_DateRange("updatedAt", opLambda, aggsLambda);
     }
 
-    public void setUpdatedAt_DateRange(String name, ConditionOptionCall<DateRangeBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
-        DateRangeBuilder builder = regDateRangeA(name, "updatedAt");
+    public void setUpdatedAt_DateRange(String name, ConditionOptionCall<DateRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
+        DateRangeAggregationBuilder builder = regDateRangeA(name, "updatedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -230,17 +230,18 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setUpdatedAt_DateHistogram(null);
     }
 
-    public void setUpdatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda) {
+    public void setUpdatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda) {
         setUpdatedAt_DateHistogram("updatedAt", opLambda, null);
     }
 
-    public void setUpdatedAt_DateHistogram(ConditionOptionCall<DateHistogramBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setUpdatedAt_DateHistogram(ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
         setUpdatedAt_DateHistogram("updatedAt", opLambda, aggsLambda);
     }
 
-    public void setUpdatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramBuilder> opLambda,
+    public void setUpdatedAt_DateHistogram(String name, ConditionOptionCall<DateHistogramAggregationBuilder> opLambda,
             OperatorCall<BsUserInfoCA> aggsLambda) {
-        DateHistogramBuilder builder = regDateHistogramA(name, "updatedAt");
+        DateHistogramAggregationBuilder builder = regDateHistogramA(name, "updatedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +256,12 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setUpdatedAt_Count(null);
     }
 
-    public void setUpdatedAt_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUpdatedAt_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUpdatedAt_Count("updatedAt", opLambda);
     }
 
-    public void setUpdatedAt_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "updatedAt");
+    public void setUpdatedAt_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "updatedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +271,12 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setUpdatedAt_Cardinality(null);
     }
 
-    public void setUpdatedAt_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUpdatedAt_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUpdatedAt_Cardinality("updatedAt", opLambda);
     }
 
-    public void setUpdatedAt_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "updatedAt");
+    public void setUpdatedAt_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "updatedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,16 +286,17 @@ public abstract class BsUserInfoCA extends EsAbstractConditionAggregation {
         setUpdatedAt_Missing(null);
     }
 
-    public void setUpdatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUpdatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUpdatedAt_Missing("updatedAt", opLambda, null);
     }
 
-    public void setUpdatedAt_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
+    public void setUpdatedAt_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
         setUpdatedAt_Missing("updatedAt", opLambda, aggsLambda);
     }
 
-    public void setUpdatedAt_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserInfoCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "updatedAt");
+    public void setUpdatedAt_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserInfoCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "updatedAt");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
index 90df448daa21eeed8038c6d9a1488d7c22395fa8..ce4f2444689baab95b353f3bf517ccf35411bc85 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsClickLogCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         ClickLogCQ cq = new ClickLogCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 ClickLogCQ cf = new ClickLogCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryRequestedAt_MatchPhrase(queryRequestedAt, null);
     }
 
-    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryRequestedAt", queryRequestedAt);
+    public void setQueryRequestedAt_MatchPhrase(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,9 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryRequestedAt_MatchPhrasePrefix(queryRequestedAt, null);
     }
 
-    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryRequestedAt", queryRequestedAt);
+    public void setQueryRequestedAt_MatchPhrasePrefix(LocalDateTime queryRequestedAt,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +277,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryRequestedAt_Fuzzy(queryRequestedAt, null);
     }
 
-    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryRequestedAt", queryRequestedAt);
+    public void setQueryRequestedAt_Fuzzy(LocalDateTime queryRequestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryRequestedAt", queryRequestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -283,7 +289,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryRequestedAt_GreaterThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_THAN, queryRequestedAt);
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -294,7 +301,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryRequestedAt_LessThan(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_THAN, queryRequestedAt);
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -305,7 +313,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryRequestedAt_GreaterEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_EQUAL, queryRequestedAt);
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -316,7 +325,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryRequestedAt_LessEqual(LocalDateTime queryRequestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_EQUAL, queryRequestedAt);
+        final Object _value = toRangeLocalDateTimeString(queryRequestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("queryRequestedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,8 +433,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_MatchPhrase(requestedAt, null);
     }
 
-    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
+    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -434,8 +444,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_MatchPhrasePrefix(requestedAt, null);
     }
 
-    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
+    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -445,8 +455,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_Fuzzy(requestedAt, null);
     }
 
-    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
+    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,7 +467,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,7 +479,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,7 +491,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +503,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -597,8 +611,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrase(queryId, null);
     }
 
-    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
+    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -608,8 +622,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrasePrefix(queryId, null);
     }
 
-    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
+    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -619,8 +633,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setQueryId_Fuzzy(queryId, null);
     }
 
-    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryId", queryId);
+    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -659,12 +673,24 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQueryId_SpanTerm(String queryId) {
+        setQueryId_SpanTerm("queryId", null);
+    }
+
+    public void setQueryId_SpanTerm(String queryId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("queryId", queryId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQueryId_GreaterThan(String queryId) {
         setQueryId_GreaterThan(queryId, null);
     }
 
     public void setQueryId_GreaterThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,7 +701,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,7 +713,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_GreaterEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -697,7 +725,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -804,8 +833,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setDocId_MatchPhrase(docId, null);
     }
 
-    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("docId", docId);
+    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -815,8 +844,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setDocId_MatchPhrasePrefix(docId, null);
     }
 
-    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
+    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -826,8 +855,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setDocId_Fuzzy(docId, null);
     }
 
-    public void setDocId_Fuzzy(String docId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("docId", docId);
+    public void setDocId_Fuzzy(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -866,12 +895,24 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDocId_SpanTerm(String docId) {
+        setDocId_SpanTerm("docId", null);
+    }
+
+    public void setDocId_SpanTerm(String docId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("docId", docId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDocId_GreaterThan(String docId) {
         setDocId_GreaterThan(docId, null);
     }
 
     public void setDocId_GreaterThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -882,7 +923,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_LessThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -893,7 +935,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_GreaterEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -904,7 +947,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_LessEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1011,8 +1055,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_MatchPhrase(userSessionId, null);
     }
 
-    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
+    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1022,8 +1066,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_MatchPhrasePrefix(userSessionId, null);
     }
 
-    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
+    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1033,8 +1077,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_Fuzzy(userSessionId, null);
     }
 
-    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
+    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1073,12 +1117,24 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserSessionId_SpanTerm(String userSessionId) {
+        setUserSessionId_SpanTerm("userSessionId", null);
+    }
+
+    public void setUserSessionId_SpanTerm(String userSessionId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userSessionId", userSessionId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserSessionId_GreaterThan(String userSessionId) {
         setUserSessionId_GreaterThan(userSessionId, null);
     }
 
     public void setUserSessionId_GreaterThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1089,7 +1145,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_LessThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1100,7 +1157,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_GreaterEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1111,7 +1169,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_LessEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1218,8 +1277,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrase(url, null);
     }
 
-    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("url", url);
+    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1229,8 +1288,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrasePrefix(url, null);
     }
 
-    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
+    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1240,8 +1299,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setUrl_Fuzzy(url, null);
     }
 
-    public void setUrl_Fuzzy(String url, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("url", url);
+    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1280,12 +1339,24 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_SpanTerm(String url) {
+        setUrl_SpanTerm("url", null);
+    }
+
+    public void setUrl_SpanTerm(String url, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_GreaterThan(String url) {
         setUrl_GreaterThan(url, null);
     }
 
     public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1296,7 +1367,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1307,7 +1379,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1318,7 +1391,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1425,8 +1499,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setOrder_MatchPhrase(order, null);
     }
 
-    public void setOrder_MatchPhrase(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("order", order);
+    public void setOrder_MatchPhrase(Integer order, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1436,8 +1510,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setOrder_MatchPhrasePrefix(order, null);
     }
 
-    public void setOrder_MatchPhrasePrefix(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("order", order);
+    public void setOrder_MatchPhrasePrefix(Integer order, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1447,8 +1521,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
         setOrder_Fuzzy(order, null);
     }
 
-    public void setOrder_Fuzzy(Integer order, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("order", order);
+    public void setOrder_Fuzzy(Integer order, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("order", order);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1459,7 +1533,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setOrder_GreaterThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_THAN, order);
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1470,7 +1545,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setOrder_LessThan(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_THAN, order);
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1481,7 +1557,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setOrder_GreaterEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_EQUAL, order);
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1569,8 @@ public abstract class BsClickLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setOrder_LessEqual(Integer order, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_EQUAL, order);
+        final Object _value = order;
+        RangeQueryBuilder builder = regRangeQ("order", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
index c58383a95a22ef3d8cbaf8c2b8ab4ecf223990a4..aa6d588fa95a09c7a220075beeceed4907e76a5b 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsFavoriteLogCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         FavoriteLogCQ cq = new FavoriteLogCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 FavoriteLogCQ cf = new FavoriteLogCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setCreatedAt_MatchPhrase(createdAt, null);
     }
 
-    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt);
+    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setCreatedAt_MatchPhrasePrefix(createdAt, null);
     }
 
-    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt);
+    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setCreatedAt_Fuzzy(createdAt, null);
     }
 
-    public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdAt", createdAt);
+    public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -284,7 +289,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -295,7 +301,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_LessThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -306,7 +313,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_GreaterEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -317,7 +325,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_LessEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -424,8 +433,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrase(url, null);
     }
 
-    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("url", url);
+    public void setUrl_MatchPhrase(String url, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -435,8 +444,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUrl_MatchPhrasePrefix(url, null);
     }
 
-    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
+    public void setUrl_MatchPhrasePrefix(String url, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -446,8 +455,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUrl_Fuzzy(url, null);
     }
 
-    public void setUrl_Fuzzy(String url, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("url", url);
+    public void setUrl_Fuzzy(String url, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("url", url);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -486,12 +495,24 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUrl_SpanTerm(String url) {
+        setUrl_SpanTerm("url", null);
+    }
+
+    public void setUrl_SpanTerm(String url, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("url", url);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUrl_GreaterThan(String url) {
         setUrl_GreaterThan(url, null);
     }
 
     public void setUrl_GreaterThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -502,7 +523,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessThan(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -513,7 +535,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_GreaterEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -524,7 +547,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUrl_LessEqual(String url, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, url);
+        final Object _value = url;
+        RangeQueryBuilder builder = regRangeQ("url", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -631,8 +655,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setDocId_MatchPhrase(docId, null);
     }
 
-    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("docId", docId);
+    public void setDocId_MatchPhrase(String docId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -642,8 +666,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setDocId_MatchPhrasePrefix(docId, null);
     }
 
-    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
+    public void setDocId_MatchPhrasePrefix(String docId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -653,8 +677,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setDocId_Fuzzy(docId, null);
     }
 
-    public void setDocId_Fuzzy(String docId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("docId", docId);
+    public void setDocId_Fuzzy(String docId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("docId", docId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -693,12 +717,24 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDocId_SpanTerm(String docId) {
+        setDocId_SpanTerm("docId", null);
+    }
+
+    public void setDocId_SpanTerm(String docId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("docId", docId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDocId_GreaterThan(String docId) {
         setDocId_GreaterThan(docId, null);
     }
 
     public void setDocId_GreaterThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -709,7 +745,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_LessThan(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -720,7 +757,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_GreaterEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,7 +769,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setDocId_LessEqual(String docId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, docId);
+        final Object _value = docId;
+        RangeQueryBuilder builder = regRangeQ("docId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -838,8 +877,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrase(queryId, null);
     }
 
-    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
+    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -849,8 +888,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrasePrefix(queryId, null);
     }
 
-    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
+    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,8 +899,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setQueryId_Fuzzy(queryId, null);
     }
 
-    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryId", queryId);
+    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -900,12 +939,24 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQueryId_SpanTerm(String queryId) {
+        setQueryId_SpanTerm("queryId", null);
+    }
+
+    public void setQueryId_SpanTerm(String queryId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("queryId", queryId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQueryId_GreaterThan(String queryId) {
         setQueryId_GreaterThan(queryId, null);
     }
 
     public void setQueryId_GreaterThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -916,7 +967,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -927,7 +979,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_GreaterEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -938,7 +991,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1045,8 +1099,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_MatchPhrase(userInfoId, null);
     }
 
-    public void setUserInfoId_MatchPhrase(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userInfoId", userInfoId);
+    public void setUserInfoId_MatchPhrase(String userInfoId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1056,8 +1110,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_MatchPhrasePrefix(userInfoId, null);
     }
 
-    public void setUserInfoId_MatchPhrasePrefix(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userInfoId", userInfoId);
+    public void setUserInfoId_MatchPhrasePrefix(String userInfoId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1067,8 +1121,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_Fuzzy(userInfoId, null);
     }
 
-    public void setUserInfoId_Fuzzy(String userInfoId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userInfoId", userInfoId);
+    public void setUserInfoId_Fuzzy(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1107,12 +1161,24 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserInfoId_SpanTerm(String userInfoId) {
+        setUserInfoId_SpanTerm("userInfoId", null);
+    }
+
+    public void setUserInfoId_SpanTerm(String userInfoId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userInfoId", userInfoId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserInfoId_GreaterThan(String userInfoId) {
         setUserInfoId_GreaterThan(userInfoId, null);
     }
 
     public void setUserInfoId_GreaterThan(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_THAN, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1123,7 +1189,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_LessThan(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_THAN, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1134,7 +1201,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_GreaterEqual(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_EQUAL, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1145,7 +1213,8 @@ public abstract class BsFavoriteLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_LessEqual(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_EQUAL, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
index caa0d1bf5d2063b168055081e792ae4ccf36e678..c0f14e51d44dc5a8100456efd35750f8ea614236 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchFieldLogCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -63,14 +67,15 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         SearchFieldLogCQ cq = new SearchFieldLogCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 SearchFieldLogCQ cf = new SearchFieldLogCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -250,8 +255,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -261,8 +266,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -272,8 +277,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -312,12 +317,24 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -328,7 +345,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -339,7 +357,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -350,7 +369,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -457,8 +477,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setSearchLogId_MatchPhrase(searchLogId, null);
     }
 
-    public void setSearchLogId_MatchPhrase(String searchLogId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("searchLogId", searchLogId);
+    public void setSearchLogId_MatchPhrase(String searchLogId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("searchLogId", searchLogId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -468,8 +488,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setSearchLogId_MatchPhrasePrefix(searchLogId, null);
     }
 
-    public void setSearchLogId_MatchPhrasePrefix(String searchLogId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("searchLogId", searchLogId);
+    public void setSearchLogId_MatchPhrasePrefix(String searchLogId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("searchLogId", searchLogId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -479,8 +499,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setSearchLogId_Fuzzy(searchLogId, null);
     }
 
-    public void setSearchLogId_Fuzzy(String searchLogId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("searchLogId", searchLogId);
+    public void setSearchLogId_Fuzzy(String searchLogId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("searchLogId", searchLogId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -519,12 +539,24 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSearchLogId_SpanTerm(String searchLogId) {
+        setSearchLogId_SpanTerm("searchLogId", null);
+    }
+
+    public void setSearchLogId_SpanTerm(String searchLogId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("searchLogId", searchLogId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSearchLogId_GreaterThan(String searchLogId) {
         setSearchLogId_GreaterThan(searchLogId, null);
     }
 
     public void setSearchLogId_GreaterThan(String searchLogId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_GREATER_THAN, searchLogId);
+        final Object _value = searchLogId;
+        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -535,7 +567,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchLogId_LessThan(String searchLogId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_LESS_THAN, searchLogId);
+        final Object _value = searchLogId;
+        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -546,7 +579,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchLogId_GreaterEqual(String searchLogId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_GREATER_EQUAL, searchLogId);
+        final Object _value = searchLogId;
+        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -557,7 +591,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchLogId_LessEqual(String searchLogId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_LESS_EQUAL, searchLogId);
+        final Object _value = searchLogId;
+        RangeQueryBuilder builder = regRangeQ("searchLogId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -664,8 +699,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrase(value, null);
     }
 
-    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("value", value);
+    public void setValue_MatchPhrase(String value, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -675,8 +710,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setValue_MatchPhrasePrefix(value, null);
     }
 
-    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
+    public void setValue_MatchPhrasePrefix(String value, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -686,8 +721,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         setValue_Fuzzy(value, null);
     }
 
-    public void setValue_Fuzzy(String value, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("value", value);
+    public void setValue_Fuzzy(String value, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("value", value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -726,12 +761,24 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setValue_SpanTerm(String value) {
+        setValue_SpanTerm("value", null);
+    }
+
+    public void setValue_SpanTerm(String value, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("value", value);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setValue_GreaterThan(String value) {
         setValue_GreaterThan(value, null);
     }
 
     public void setValue_GreaterThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -742,7 +789,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessThan(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -753,7 +801,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_GreaterEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -764,7 +813,8 @@ public abstract class BsSearchFieldLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setValue_LessEqual(String value, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, value);
+        final Object _value = value;
+        RangeQueryBuilder builder = regRangeQ("value", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
index d158692a6bfefa56830aba78919a272b1cb62b08..849f3a71f627f1bb0946b22f39edd2eb213fb228 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsSearchLogCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         SearchLogCQ cq = new SearchLogCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 SearchLogCQ cf = new SearchLogCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setAccessType_MatchPhrase(accessType, null);
     }
 
-    public void setAccessType_MatchPhrase(String accessType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("accessType", accessType);
+    public void setAccessType_MatchPhrase(String accessType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("accessType", accessType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setAccessType_MatchPhrasePrefix(accessType, null);
     }
 
-    public void setAccessType_MatchPhrasePrefix(String accessType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("accessType", accessType);
+    public void setAccessType_MatchPhrasePrefix(String accessType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("accessType", accessType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setAccessType_Fuzzy(accessType, null);
     }
 
-    public void setAccessType_Fuzzy(String accessType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("accessType", accessType);
+    public void setAccessType_Fuzzy(String accessType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("accessType", accessType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setAccessType_SpanTerm(String accessType) {
+        setAccessType_SpanTerm("accessType", null);
+    }
+
+    public void setAccessType_SpanTerm(String accessType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("accessType", accessType);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setAccessType_GreaterThan(String accessType) {
         setAccessType_GreaterThan(accessType, null);
     }
 
     public void setAccessType_GreaterThan(String accessType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_GREATER_THAN, accessType);
+        final Object _value = accessType;
+        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setAccessType_LessThan(String accessType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_LESS_THAN, accessType);
+        final Object _value = accessType;
+        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setAccessType_GreaterEqual(String accessType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_GREATER_EQUAL, accessType);
+        final Object _value = accessType;
+        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setAccessType_LessEqual(String accessType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_LESS_EQUAL, accessType);
+        final Object _value = accessType;
+        RangeQueryBuilder builder = regRangeQ("accessType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUser_MatchPhrase(user, null);
     }
 
-    public void setUser_MatchPhrase(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("user", user);
+    public void setUser_MatchPhrase(String user, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("user", user);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUser_MatchPhrasePrefix(user, null);
     }
 
-    public void setUser_MatchPhrasePrefix(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("user", user);
+    public void setUser_MatchPhrasePrefix(String user, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("user", user);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUser_Fuzzy(user, null);
     }
 
-    public void setUser_Fuzzy(String user, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("user", user);
+    public void setUser_Fuzzy(String user, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("user", user);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -518,12 +538,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUser_SpanTerm(String user) {
+        setUser_SpanTerm("user", null);
+    }
+
+    public void setUser_SpanTerm(String user, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("user", user);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUser_GreaterThan(String user) {
         setUser_GreaterThan(user, null);
     }
 
     public void setUser_GreaterThan(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_THAN, user);
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -534,7 +566,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUser_LessThan(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_THAN, user);
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -545,7 +578,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUser_GreaterEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_EQUAL, user);
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -556,7 +590,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUser_LessEqual(String user, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_EQUAL, user);
+        final Object _value = user;
+        RangeQueryBuilder builder = regRangeQ("user", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,8 +698,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRoles_MatchPhrase(roles, null);
     }
 
-    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roles", roles);
+    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -674,8 +709,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRoles_MatchPhrasePrefix(roles, null);
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
+    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -685,8 +720,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRoles_Fuzzy(roles, null);
     }
 
-    public void setRoles_Fuzzy(String roles, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roles", roles);
+    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -725,12 +760,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoles_SpanTerm(String roles) {
+        setRoles_SpanTerm("roles", null);
+    }
+
+    public void setRoles_SpanTerm(String roles, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roles", roles);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoles_GreaterThan(String roles) {
         setRoles_GreaterThan(roles, null);
     }
 
     public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -741,7 +788,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -752,7 +800,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,7 +812,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -870,8 +920,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrase(queryId, null);
     }
 
-    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
+    public void setQueryId_MatchPhrase(String queryId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -881,8 +931,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryId_MatchPhrasePrefix(queryId, null);
     }
 
-    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
+    public void setQueryId_MatchPhrasePrefix(String queryId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -892,8 +942,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryId_Fuzzy(queryId, null);
     }
 
-    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryId", queryId);
+    public void setQueryId_Fuzzy(String queryId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryId", queryId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -932,12 +982,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setQueryId_SpanTerm(String queryId) {
+        setQueryId_SpanTerm("queryId", null);
+    }
+
+    public void setQueryId_SpanTerm(String queryId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("queryId", queryId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setQueryId_GreaterThan(String queryId) {
         setQueryId_GreaterThan(queryId, null);
     }
 
     public void setQueryId_GreaterThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -948,7 +1010,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessThan(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,7 +1022,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_GreaterEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -970,7 +1034,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryId_LessEqual(String queryId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, queryId);
+        final Object _value = queryId;
+        RangeQueryBuilder builder = regRangeQ("queryId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1077,8 +1142,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setClientIp_MatchPhrase(clientIp, null);
     }
 
-    public void setClientIp_MatchPhrase(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("clientIp", clientIp);
+    public void setClientIp_MatchPhrase(String clientIp, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,8 +1153,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setClientIp_MatchPhrasePrefix(clientIp, null);
     }
 
-    public void setClientIp_MatchPhrasePrefix(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("clientIp", clientIp);
+    public void setClientIp_MatchPhrasePrefix(String clientIp, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1099,8 +1164,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setClientIp_Fuzzy(clientIp, null);
     }
 
-    public void setClientIp_Fuzzy(String clientIp, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("clientIp", clientIp);
+    public void setClientIp_Fuzzy(String clientIp, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("clientIp", clientIp);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1139,12 +1204,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setClientIp_SpanTerm(String clientIp) {
+        setClientIp_SpanTerm("clientIp", null);
+    }
+
+    public void setClientIp_SpanTerm(String clientIp, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("clientIp", clientIp);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setClientIp_GreaterThan(String clientIp) {
         setClientIp_GreaterThan(clientIp, null);
     }
 
     public void setClientIp_GreaterThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_THAN, clientIp);
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1155,7 +1232,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setClientIp_LessThan(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_THAN, clientIp);
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1166,7 +1244,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setClientIp_GreaterEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_EQUAL, clientIp);
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1177,7 +1256,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setClientIp_LessEqual(String clientIp, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_EQUAL, clientIp);
+        final Object _value = clientIp;
+        RangeQueryBuilder builder = regRangeQ("clientIp", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1284,8 +1364,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setHitCount_MatchPhrase(hitCount, null);
     }
 
-    public void setHitCount_MatchPhrase(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("hitCount", hitCount);
+    public void setHitCount_MatchPhrase(Long hitCount, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1295,8 +1375,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setHitCount_MatchPhrasePrefix(hitCount, null);
     }
 
-    public void setHitCount_MatchPhrasePrefix(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("hitCount", hitCount);
+    public void setHitCount_MatchPhrasePrefix(Long hitCount, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1306,8 +1386,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setHitCount_Fuzzy(hitCount, null);
     }
 
-    public void setHitCount_Fuzzy(Long hitCount, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("hitCount", hitCount);
+    public void setHitCount_Fuzzy(Long hitCount, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("hitCount", hitCount);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1318,7 +1398,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setHitCount_GreaterThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_THAN, hitCount);
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1329,7 +1410,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setHitCount_LessThan(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_THAN, hitCount);
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1340,7 +1422,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setHitCount_GreaterEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_EQUAL, hitCount);
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1351,7 +1434,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setHitCount_LessEqual(Long hitCount, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_EQUAL, hitCount);
+        final Object _value = hitCount;
+        RangeQueryBuilder builder = regRangeQ("hitCount", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1458,8 +1542,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryOffset_MatchPhrase(queryOffset, null);
     }
 
-    public void setQueryOffset_MatchPhrase(Integer queryOffset, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryOffset", queryOffset);
+    public void setQueryOffset_MatchPhrase(Integer queryOffset, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryOffset", queryOffset);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1469,8 +1553,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryOffset_MatchPhrasePrefix(queryOffset, null);
     }
 
-    public void setQueryOffset_MatchPhrasePrefix(Integer queryOffset, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryOffset", queryOffset);
+    public void setQueryOffset_MatchPhrasePrefix(Integer queryOffset, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryOffset", queryOffset);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1480,8 +1564,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryOffset_Fuzzy(queryOffset, null);
     }
 
-    public void setQueryOffset_Fuzzy(Integer queryOffset, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryOffset", queryOffset);
+    public void setQueryOffset_Fuzzy(Integer queryOffset, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryOffset", queryOffset);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1492,7 +1576,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryOffset_GreaterThan(Integer queryOffset, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_GREATER_THAN, queryOffset);
+        final Object _value = queryOffset;
+        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1503,7 +1588,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryOffset_LessThan(Integer queryOffset, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_LESS_THAN, queryOffset);
+        final Object _value = queryOffset;
+        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1514,7 +1600,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryOffset_GreaterEqual(Integer queryOffset, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_GREATER_EQUAL, queryOffset);
+        final Object _value = queryOffset;
+        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1525,7 +1612,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryOffset_LessEqual(Integer queryOffset, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_LESS_EQUAL, queryOffset);
+        final Object _value = queryOffset;
+        RangeQueryBuilder builder = regRangeQ("queryOffset", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1632,8 +1720,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryPageSize_MatchPhrase(queryPageSize, null);
     }
 
-    public void setQueryPageSize_MatchPhrase(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryPageSize", queryPageSize);
+    public void setQueryPageSize_MatchPhrase(Integer queryPageSize, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryPageSize", queryPageSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1643,8 +1731,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryPageSize_MatchPhrasePrefix(queryPageSize, null);
     }
 
-    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryPageSize", queryPageSize);
+    public void setQueryPageSize_MatchPhrasePrefix(Integer queryPageSize, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryPageSize", queryPageSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1654,8 +1742,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryPageSize_Fuzzy(queryPageSize, null);
     }
 
-    public void setQueryPageSize_Fuzzy(Integer queryPageSize, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryPageSize", queryPageSize);
+    public void setQueryPageSize_Fuzzy(Integer queryPageSize, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryPageSize", queryPageSize);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1666,7 +1754,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryPageSize_GreaterThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_THAN, queryPageSize);
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1677,7 +1766,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryPageSize_LessThan(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_THAN, queryPageSize);
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1688,7 +1778,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryPageSize_GreaterEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_EQUAL, queryPageSize);
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1699,7 +1790,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryPageSize_LessEqual(Integer queryPageSize, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_EQUAL, queryPageSize);
+        final Object _value = queryPageSize;
+        RangeQueryBuilder builder = regRangeQ("queryPageSize", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1806,8 +1898,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setReferer_MatchPhrase(referer, null);
     }
 
-    public void setReferer_MatchPhrase(String referer, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("referer", referer);
+    public void setReferer_MatchPhrase(String referer, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("referer", referer);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1817,8 +1909,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setReferer_MatchPhrasePrefix(referer, null);
     }
 
-    public void setReferer_MatchPhrasePrefix(String referer, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("referer", referer);
+    public void setReferer_MatchPhrasePrefix(String referer, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("referer", referer);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1828,8 +1920,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setReferer_Fuzzy(referer, null);
     }
 
-    public void setReferer_Fuzzy(String referer, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("referer", referer);
+    public void setReferer_Fuzzy(String referer, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("referer", referer);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1868,12 +1960,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setReferer_SpanTerm(String referer) {
+        setReferer_SpanTerm("referer", null);
+    }
+
+    public void setReferer_SpanTerm(String referer, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("referer", referer);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setReferer_GreaterThan(String referer) {
         setReferer_GreaterThan(referer, null);
     }
 
     public void setReferer_GreaterThan(String referer, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_GREATER_THAN, referer);
+        final Object _value = referer;
+        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1884,7 +1988,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setReferer_LessThan(String referer, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_LESS_THAN, referer);
+        final Object _value = referer;
+        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1895,7 +2000,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setReferer_GreaterEqual(String referer, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_GREATER_EQUAL, referer);
+        final Object _value = referer;
+        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1906,7 +2012,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setReferer_LessEqual(String referer, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_LESS_EQUAL, referer);
+        final Object _value = referer;
+        RangeQueryBuilder builder = regRangeQ("referer", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2013,8 +2120,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_MatchPhrase(requestedAt, null);
     }
 
-    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
+    public void setRequestedAt_MatchPhrase(LocalDateTime requestedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2024,8 +2131,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_MatchPhrasePrefix(requestedAt, null);
     }
 
-    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
+    public void setRequestedAt_MatchPhrasePrefix(LocalDateTime requestedAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2035,8 +2142,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setRequestedAt_Fuzzy(requestedAt, null);
     }
 
-    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
+    public void setRequestedAt_Fuzzy(LocalDateTime requestedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("requestedAt", requestedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2047,7 +2154,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_GreaterThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2058,7 +2166,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_LessThan(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2069,7 +2178,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_GreaterEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2080,7 +2190,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setRequestedAt_LessEqual(LocalDateTime requestedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, requestedAt);
+        final Object _value = toRangeLocalDateTimeString(requestedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("requestedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2187,8 +2298,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setResponseTime_MatchPhrase(responseTime, null);
     }
 
-    public void setResponseTime_MatchPhrase(Long responseTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("responseTime", responseTime);
+    public void setResponseTime_MatchPhrase(Long responseTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("responseTime", responseTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2198,8 +2309,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setResponseTime_MatchPhrasePrefix(responseTime, null);
     }
 
-    public void setResponseTime_MatchPhrasePrefix(Long responseTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("responseTime", responseTime);
+    public void setResponseTime_MatchPhrasePrefix(Long responseTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("responseTime", responseTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2209,8 +2320,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setResponseTime_Fuzzy(responseTime, null);
     }
 
-    public void setResponseTime_Fuzzy(Long responseTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("responseTime", responseTime);
+    public void setResponseTime_Fuzzy(Long responseTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("responseTime", responseTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2221,7 +2332,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setResponseTime_GreaterThan(Long responseTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_THAN, responseTime);
+        final Object _value = responseTime;
+        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2232,7 +2344,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setResponseTime_LessThan(Long responseTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_THAN, responseTime);
+        final Object _value = responseTime;
+        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2243,7 +2356,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setResponseTime_GreaterEqual(Long responseTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_EQUAL, responseTime);
+        final Object _value = responseTime;
+        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2254,7 +2368,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setResponseTime_LessEqual(Long responseTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_EQUAL, responseTime);
+        final Object _value = responseTime;
+        RangeQueryBuilder builder = regRangeQ("responseTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2361,8 +2476,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryTime_MatchPhrase(queryTime, null);
     }
 
-    public void setQueryTime_MatchPhrase(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("queryTime", queryTime);
+    public void setQueryTime_MatchPhrase(Long queryTime, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2372,8 +2487,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryTime_MatchPhrasePrefix(queryTime, null);
     }
 
-    public void setQueryTime_MatchPhrasePrefix(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("queryTime", queryTime);
+    public void setQueryTime_MatchPhrasePrefix(Long queryTime, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2383,8 +2498,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setQueryTime_Fuzzy(queryTime, null);
     }
 
-    public void setQueryTime_Fuzzy(Long queryTime, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("queryTime", queryTime);
+    public void setQueryTime_Fuzzy(Long queryTime, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("queryTime", queryTime);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2395,7 +2510,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryTime_GreaterThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_THAN, queryTime);
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2406,7 +2522,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryTime_LessThan(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_THAN, queryTime);
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2417,7 +2534,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryTime_GreaterEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_EQUAL, queryTime);
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2428,7 +2546,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setQueryTime_LessEqual(Long queryTime, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_EQUAL, queryTime);
+        final Object _value = queryTime;
+        RangeQueryBuilder builder = regRangeQ("queryTime", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2535,8 +2654,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setSearchWord_MatchPhrase(searchWord, null);
     }
 
-    public void setSearchWord_MatchPhrase(String searchWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("searchWord", searchWord);
+    public void setSearchWord_MatchPhrase(String searchWord, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("searchWord", searchWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2546,8 +2665,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setSearchWord_MatchPhrasePrefix(searchWord, null);
     }
 
-    public void setSearchWord_MatchPhrasePrefix(String searchWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("searchWord", searchWord);
+    public void setSearchWord_MatchPhrasePrefix(String searchWord, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("searchWord", searchWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2557,8 +2676,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setSearchWord_Fuzzy(searchWord, null);
     }
 
-    public void setSearchWord_Fuzzy(String searchWord, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("searchWord", searchWord);
+    public void setSearchWord_Fuzzy(String searchWord, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("searchWord", searchWord);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2597,12 +2716,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSearchWord_SpanTerm(String searchWord) {
+        setSearchWord_SpanTerm("searchWord", null);
+    }
+
+    public void setSearchWord_SpanTerm(String searchWord, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("searchWord", searchWord);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSearchWord_GreaterThan(String searchWord) {
         setSearchWord_GreaterThan(searchWord, null);
     }
 
     public void setSearchWord_GreaterThan(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_GREATER_THAN, searchWord);
+        final Object _value = searchWord;
+        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2613,7 +2744,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchWord_LessThan(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_THAN, searchWord);
+        final Object _value = searchWord;
+        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2624,7 +2756,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchWord_GreaterEqual(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_GREATER_EQUAL, searchWord);
+        final Object _value = searchWord;
+        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2635,7 +2768,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setSearchWord_LessEqual(String searchWord, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_EQUAL, searchWord);
+        final Object _value = searchWord;
+        RangeQueryBuilder builder = regRangeQ("searchWord", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2742,8 +2876,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrase(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrase(String userAgent, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2753,8 +2887,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserAgent_MatchPhrasePrefix(userAgent, null);
     }
 
-    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
+    public void setUserAgent_MatchPhrasePrefix(String userAgent, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2764,8 +2898,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserAgent_Fuzzy(userAgent, null);
     }
 
-    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
+    public void setUserAgent_Fuzzy(String userAgent, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userAgent", userAgent);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2804,12 +2938,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserAgent_SpanTerm(String userAgent) {
+        setUserAgent_SpanTerm("userAgent", null);
+    }
+
+    public void setUserAgent_SpanTerm(String userAgent, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userAgent", userAgent);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserAgent_GreaterThan(String userAgent) {
         setUserAgent_GreaterThan(userAgent, null);
     }
 
     public void setUserAgent_GreaterThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2820,7 +2966,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessThan(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2831,7 +2978,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_GreaterEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2842,7 +2990,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserAgent_LessEqual(String userAgent, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, userAgent);
+        final Object _value = userAgent;
+        RangeQueryBuilder builder = regRangeQ("userAgent", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2949,8 +3098,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_MatchPhrase(userInfoId, null);
     }
 
-    public void setUserInfoId_MatchPhrase(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userInfoId", userInfoId);
+    public void setUserInfoId_MatchPhrase(String userInfoId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2960,8 +3109,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_MatchPhrasePrefix(userInfoId, null);
     }
 
-    public void setUserInfoId_MatchPhrasePrefix(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userInfoId", userInfoId);
+    public void setUserInfoId_MatchPhrasePrefix(String userInfoId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2971,8 +3120,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserInfoId_Fuzzy(userInfoId, null);
     }
 
-    public void setUserInfoId_Fuzzy(String userInfoId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userInfoId", userInfoId);
+    public void setUserInfoId_Fuzzy(String userInfoId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userInfoId", userInfoId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3011,12 +3160,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserInfoId_SpanTerm(String userInfoId) {
+        setUserInfoId_SpanTerm("userInfoId", null);
+    }
+
+    public void setUserInfoId_SpanTerm(String userInfoId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userInfoId", userInfoId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserInfoId_GreaterThan(String userInfoId) {
         setUserInfoId_GreaterThan(userInfoId, null);
     }
 
     public void setUserInfoId_GreaterThan(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_THAN, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3027,7 +3188,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_LessThan(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_THAN, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3038,7 +3200,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_GreaterEqual(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_EQUAL, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3049,7 +3212,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserInfoId_LessEqual(String userInfoId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_EQUAL, userInfoId);
+        final Object _value = userInfoId;
+        RangeQueryBuilder builder = regRangeQ("userInfoId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3156,8 +3320,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_MatchPhrase(userSessionId, null);
     }
 
-    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
+    public void setUserSessionId_MatchPhrase(String userSessionId, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3167,8 +3331,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_MatchPhrasePrefix(userSessionId, null);
     }
 
-    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
+    public void setUserSessionId_MatchPhrasePrefix(String userSessionId, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3178,8 +3342,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setUserSessionId_Fuzzy(userSessionId, null);
     }
 
-    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
+    public void setUserSessionId_Fuzzy(String userSessionId, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("userSessionId", userSessionId);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3218,12 +3382,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setUserSessionId_SpanTerm(String userSessionId) {
+        setUserSessionId_SpanTerm("userSessionId", null);
+    }
+
+    public void setUserSessionId_SpanTerm(String userSessionId, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("userSessionId", userSessionId);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setUserSessionId_GreaterThan(String userSessionId) {
         setUserSessionId_GreaterThan(userSessionId, null);
     }
 
     public void setUserSessionId_GreaterThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3234,7 +3410,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_LessThan(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3245,7 +3422,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_GreaterEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3256,7 +3434,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setUserSessionId_LessEqual(String userSessionId, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, userSessionId);
+        final Object _value = userSessionId;
+        RangeQueryBuilder builder = regRangeQ("userSessionId", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3363,8 +3542,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setLanguages_MatchPhrase(languages, null);
     }
 
-    public void setLanguages_MatchPhrase(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("languages", languages);
+    public void setLanguages_MatchPhrase(String languages, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3374,8 +3553,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setLanguages_MatchPhrasePrefix(languages, null);
     }
 
-    public void setLanguages_MatchPhrasePrefix(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("languages", languages);
+    public void setLanguages_MatchPhrasePrefix(String languages, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3385,8 +3564,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         setLanguages_Fuzzy(languages, null);
     }
 
-    public void setLanguages_Fuzzy(String languages, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("languages", languages);
+    public void setLanguages_Fuzzy(String languages, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("languages", languages);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3425,12 +3604,24 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLanguages_SpanTerm(String languages) {
+        setLanguages_SpanTerm("languages", null);
+    }
+
+    public void setLanguages_SpanTerm(String languages, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("languages", languages);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLanguages_GreaterThan(String languages) {
         setLanguages_GreaterThan(languages, null);
     }
 
     public void setLanguages_GreaterThan(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_THAN, languages);
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3441,7 +3632,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLanguages_LessThan(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_THAN, languages);
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3452,7 +3644,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLanguages_GreaterEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_EQUAL, languages);
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3463,7 +3656,8 @@ public abstract class BsSearchLogCQ extends EsAbstractConditionQuery {
     }
 
     public void setLanguages_LessEqual(String languages, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_EQUAL, languages);
+        final Object _value = languages;
+        RangeQueryBuilder builder = regRangeQ("languages", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
index cfb9c6bd03c40aa08a971ac7c336153f2ff36ae8..6c21e04a2eb99501ee15ae00886684ca2640dd82 100644
--- a/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
+++ b/src/main/java/org/codelibs/fess/es/log/cbean/cq/bs/BsUserInfoCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.log.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.log.allcommon.EsAbstractConditionQuery;
@@ -24,13 +25,15 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -59,14 +62,15 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         UserInfoCQ cq = new UserInfoCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 UserInfoCQ cf = new UserInfoCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -246,8 +250,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setCreatedAt_MatchPhrase(createdAt, null);
     }
 
-    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt);
+    public void setCreatedAt_MatchPhrase(LocalDateTime createdAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -257,8 +261,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setCreatedAt_MatchPhrasePrefix(createdAt, null);
     }
 
-    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt);
+    public void setCreatedAt_MatchPhrasePrefix(LocalDateTime createdAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -268,8 +272,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setCreatedAt_Fuzzy(createdAt, null);
     }
 
-    public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("createdAt", createdAt);
+    public void setCreatedAt_Fuzzy(LocalDateTime createdAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("createdAt", createdAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -280,7 +284,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_GreaterThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -291,7 +296,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_LessThan(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -302,7 +308,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_GreaterEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -313,7 +320,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setCreatedAt_LessEqual(LocalDateTime createdAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, createdAt);
+        final Object _value = toRangeLocalDateTimeString(createdAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("createdAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -420,8 +428,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setUpdatedAt_MatchPhrase(updatedAt, null);
     }
 
-    public void setUpdatedAt_MatchPhrase(LocalDateTime updatedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("updatedAt", updatedAt);
+    public void setUpdatedAt_MatchPhrase(LocalDateTime updatedAt, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("updatedAt", updatedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -431,8 +439,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setUpdatedAt_MatchPhrasePrefix(updatedAt, null);
     }
 
-    public void setUpdatedAt_MatchPhrasePrefix(LocalDateTime updatedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("updatedAt", updatedAt);
+    public void setUpdatedAt_MatchPhrasePrefix(LocalDateTime updatedAt, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("updatedAt", updatedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -442,8 +450,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
         setUpdatedAt_Fuzzy(updatedAt, null);
     }
 
-    public void setUpdatedAt_Fuzzy(LocalDateTime updatedAt, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("updatedAt", updatedAt);
+    public void setUpdatedAt_Fuzzy(LocalDateTime updatedAt, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("updatedAt", updatedAt);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -454,7 +462,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedAt_GreaterThan(LocalDateTime updatedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_THAN, updatedAt);
+        final Object _value = toRangeLocalDateTimeString(updatedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -465,7 +474,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedAt_LessThan(LocalDateTime updatedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_THAN, updatedAt);
+        final Object _value = toRangeLocalDateTimeString(updatedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -476,7 +486,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedAt_GreaterEqual(LocalDateTime updatedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_EQUAL, updatedAt);
+        final Object _value = toRangeLocalDateTimeString(updatedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -487,7 +498,8 @@ public abstract class BsUserInfoCQ extends EsAbstractConditionQuery {
     }
 
     public void setUpdatedAt_LessEqual(LocalDateTime updatedAt, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_EQUAL, updatedAt);
+        final Object _value = toRangeLocalDateTimeString(updatedAt, "date_optional_time");
+        RangeQueryBuilder builder = regRangeQ("updatedAt", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
index 019983c8f2b2d273c361ba7de049d8ccb1ad844b..77afd6075e9b256e7203892dafd3d6ede0ff5b79 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractBehavior.java
@@ -39,6 +39,7 @@ import org.dbflute.cbean.result.ListResultBean;
 import org.dbflute.exception.FetchingOverSafetySizeException;
 import org.dbflute.exception.IllegalBehaviorStateException;
 import org.dbflute.util.DfTypeUtil;
+import org.elasticsearch.action.DocWriteResponse.Result;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
 import org.elasticsearch.action.bulk.BulkItemResponse;
 import org.elasticsearch.action.bulk.BulkRequestBuilder;
@@ -266,7 +267,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
 
         final IndexResponse response = builder.execute().actionGet(indexTimeout);
         esEntity.asDocMeta().id(response.getId());
-        return response.isCreated() ? 1 : 0;
+        return response.getResult() == Result.CREATED ? 1 : 0;
     }
 
     protected IndexRequestBuilder createInsertRequest(final EsAbstractEntity esEntity) {
@@ -315,7 +316,7 @@ public abstract class EsAbstractBehavior<ENTITY extends Entity, CB extends Condi
         final DeleteRequestBuilder builder = createDeleteRequest(esEntity);
 
         final DeleteResponse response = builder.execute().actionGet(deleteTimeout);
-        return response.isFound() ? 1 : 0;
+        return response.getResult() == Result.DELETED ? 1 : 0;
     }
 
     protected DeleteRequestBuilder createDeleteRequest(final EsAbstractEntity esEntity) {
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
index 7c26c50edf01e00aebe7c55d55fbf9e89d68d452..bf69ec93694ed6b0407634457d535ad86b14fcde 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionAggregation.java
@@ -25,28 +25,28 @@ import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.date.DateRangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,148 +58,148 @@ public abstract class EsAbstractConditionAggregation {
     // ===================================================================================
     //                                                                           Attribute
     //                                                                           =========
-    protected List<AbstractAggregationBuilder> aggregationBuilderList;
+    protected List<AbstractAggregationBuilder> aggregationAggregationBuilderList;
 
     // ===================================================================================
     //                                                                             Control
     //                                                                             =======
 
     public boolean hasAggregations() {
-        return aggregationBuilderList != null && !aggregationBuilderList.isEmpty();
+        return aggregationAggregationBuilderList != null && !aggregationAggregationBuilderList.isEmpty();
     }
 
     public List<AbstractAggregationBuilder> getAggregationBuilderList() {
-        return aggregationBuilderList != null ? aggregationBuilderList : Collections.emptyList();
+        return aggregationAggregationBuilderList != null ? aggregationAggregationBuilderList : Collections.emptyList();
     }
 
     // ===================================================================================
     //                                                                         Aggregation
     //                                                                               =====
-    public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-        assertObjectNotNull("aggregationBuilder", aggregationBuilder);
-        regA(aggregationBuilder);
+    public void addAggregation(AbstractAggregationBuilder aggregationAggregationBuilder) {
+        assertObjectNotNull("aggregationAggregationBuilder", aggregationAggregationBuilder);
+        regA(aggregationAggregationBuilder);
     }
 
     // ===================================================================================
     //                                                                            Register
     //                                                                            ========
 
-    protected AvgBuilder regAvgA(String name, String field) {
-        AvgBuilder builder = AggregationBuilders.avg(name).field(field);
+    protected AvgAggregationBuilder regAvgA(String name, String field) {
+        AvgAggregationBuilder builder = AggregationBuilders.avg(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MaxBuilder regMaxA(String name, String field) {
-        MaxBuilder builder = AggregationBuilders.max(name).field(field);
+    protected MaxAggregationBuilder regMaxA(String name, String field) {
+        MaxAggregationBuilder builder = AggregationBuilders.max(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MinBuilder regMinA(String name, String field) {
-        MinBuilder builder = AggregationBuilders.min(name).field(field);
+    protected MinAggregationBuilder regMinA(String name, String field) {
+        MinAggregationBuilder builder = AggregationBuilders.min(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SumBuilder regSumA(String name, String field) {
-        SumBuilder builder = AggregationBuilders.sum(name).field(field);
+    protected SumAggregationBuilder regSumA(String name, String field) {
+        SumAggregationBuilder builder = AggregationBuilders.sum(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ExtendedStatsBuilder regExtendedStatsA(String name, String field) {
-        ExtendedStatsBuilder builder = AggregationBuilders.extendedStats(name).field(field);
+    protected ExtendedStatsAggregationBuilder regExtendedStatsA(String name, String field) {
+        ExtendedStatsAggregationBuilder builder = AggregationBuilders.extendedStats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected StatsBuilder regStatsA(String name, String field) {
-        StatsBuilder builder = AggregationBuilders.stats(name).field(field);
+    protected StatsAggregationBuilder regStatsA(String name, String field) {
+        StatsAggregationBuilder builder = AggregationBuilders.stats(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentilesBuilder regPercentilesA(String name, String field) {
-        PercentilesBuilder builder = AggregationBuilders.percentiles(name).field(field);
+    protected PercentilesAggregationBuilder regPercentilesA(String name, String field) {
+        PercentilesAggregationBuilder builder = AggregationBuilders.percentiles(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected PercentileRanksBuilder regPercentileRanksA(String name, String field) {
-        PercentileRanksBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
+    protected PercentileRanksAggregationBuilder regPercentileRanksA(String name, String field) {
+        PercentileRanksAggregationBuilder builder = AggregationBuilders.percentileRanks(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected CardinalityBuilder regCardinalityA(String name, String field) {
-        CardinalityBuilder builder = AggregationBuilders.cardinality(name).field(field);
+    protected CardinalityAggregationBuilder regCardinalityA(String name, String field) {
+        CardinalityAggregationBuilder builder = AggregationBuilders.cardinality(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected ValueCountBuilder regCountA(String name, String field) {
-        ValueCountBuilder builder = AggregationBuilders.count(name).field(field);
+    protected ValueCountAggregationBuilder regCountA(String name, String field) {
+        ValueCountAggregationBuilder builder = AggregationBuilders.count(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected TermsBuilder regTermsA(String name, String field) {
-        TermsBuilder builder = AggregationBuilders.terms(name).field(field);
+    protected TermsAggregationBuilder regTermsA(String name, String field) {
+        TermsAggregationBuilder builder = AggregationBuilders.terms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected SignificantTermsBuilder regSignificantTermsA(String name, String field) {
-        SignificantTermsBuilder builder = AggregationBuilders.significantTerms(name).field(field);
+    protected SignificantTermsAggregationBuilder regSignificantTermsA(String name, String field) {
+        SignificantTermsAggregationBuilder builder = AggregationBuilders.significantTerms(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected HistogramBuilder regHistogramA(String name, String field) {
-        HistogramBuilder builder = AggregationBuilders.histogram(name).field(field);
+    protected HistogramAggregationBuilder regHistogramA(String name, String field) {
+        HistogramAggregationBuilder builder = AggregationBuilders.histogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateHistogramBuilder regDateHistogramA(String name, String field) {
-        DateHistogramBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
+    protected DateHistogramAggregationBuilder regDateHistogramA(String name, String field) {
+        DateHistogramAggregationBuilder builder = AggregationBuilders.dateHistogram(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected RangeBuilder regRangeA(String name, String field) {
-        RangeBuilder builder = AggregationBuilders.range(name).field(field);
+    protected RangeAggregationBuilder regRangeA(String name, String field) {
+        RangeAggregationBuilder builder = AggregationBuilders.range(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected DateRangeBuilder regDateRangeA(String name, String field) {
-        DateRangeBuilder builder = AggregationBuilders.dateRange(name).field(field);
+    protected DateRangeAggregationBuilder regDateRangeA(String name, String field) {
+        DateRangeAggregationBuilder builder = AggregationBuilders.dateRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected IPv4RangeBuilder regIpRangeA(String name, String field) {
-        IPv4RangeBuilder builder = AggregationBuilders.ipRange(name).field(field);
+    protected IpRangeAggregationBuilder regIpRangeA(String name, String field) {
+        IpRangeAggregationBuilder builder = AggregationBuilders.ipRange(name).field(field);
         regA(builder);
         return builder;
     }
 
-    protected MissingBuilder regMissingA(String name, String field) {
-        MissingBuilder builder = AggregationBuilders.missing(name).field(field);
+    protected MissingAggregationBuilder regMissingA(String name, String field) {
+        MissingAggregationBuilder builder = AggregationBuilders.missing(name).field(field);
         regA(builder);
         return builder;
     }
 
     protected FilterAggregationBuilder regFilterA(String name, QueryBuilder filter) {
-        FilterAggregationBuilder builder = AggregationBuilders.filter(name).filter(filter);
+        FilterAggregationBuilder builder = AggregationBuilders.filter(name, filter);
         regA(builder);
         return builder;
     }
 
-    protected GlobalBuilder regGlobalA(String name) {
-        GlobalBuilder builder = AggregationBuilders.global(name);
+    protected GlobalAggregationBuilder regGlobalA(String name) {
+        GlobalAggregationBuilder builder = AggregationBuilders.global(name);
         regA(builder);
         return builder;
     }
@@ -210,24 +210,24 @@ public abstract class EsAbstractConditionAggregation {
         return builder;
     }
 
-    protected ScriptedMetricBuilder regScriptedMetricA(String name) {
-        ScriptedMetricBuilder builder = AggregationBuilders.scriptedMetric(name);
+    protected ScriptedMetricAggregationBuilder regScriptedMetricA(String name) {
+        ScriptedMetricAggregationBuilder builder = AggregationBuilders.scriptedMetric(name);
         regA(builder);
         return builder;
     }
 
-    protected TopHitsBuilder regTopHitsA(String name) {
-        TopHitsBuilder builder = AggregationBuilders.topHits(name);
+    protected TopHitsAggregationBuilder regTopHitsA(String name) {
+        TopHitsAggregationBuilder builder = AggregationBuilders.topHits(name);
         regA(builder);
         return builder;
     }
 
     protected void regA(AbstractAggregationBuilder builder) {
         assertObjectNotNull("builder", builder);
-        if (aggregationBuilderList == null) {
-            aggregationBuilderList = new ArrayList<>();
+        if (aggregationAggregationBuilderList == null) {
+            aggregationAggregationBuilderList = new ArrayList<>();
         }
-        aggregationBuilderList.add(builder);
+        aggregationAggregationBuilderList.add(builder);
     }
 
     // ===================================================================================
diff --git a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
index 8fe1c1471aaaabe36695f8eb8ef293e07f9d4378..66b8c90def8818b3b2fbe9b7a04b16228bf3d6af 100644
--- a/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
+++ b/src/main/java/org/codelibs/fess/es/user/allcommon/EsAbstractConditionQuery.java
@@ -15,10 +15,16 @@
  */
 package org.codelibs.fess.es.user.allcommon;
 
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 import org.dbflute.cbean.ConditionBean;
 import org.dbflute.cbean.ConditionQuery;
@@ -32,12 +38,14 @@ import org.dbflute.dbmeta.name.ColumnRealName;
 import org.dbflute.dbmeta.name.ColumnSqlName;
 import org.dbflute.exception.InvalidQueryRegisteredException;
 import org.dbflute.util.Srl;
+import org.elasticsearch.common.unit.Fuzziness;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
@@ -46,10 +54,12 @@ import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
@@ -152,8 +162,9 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
     //                                                                            Register
     //                                                                            ========
 
-    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder) {
-        FunctionScoreQueryBuilder functionScoreQuery = QueryBuilders.functionScoreQuery(queryBuilder);
+    protected FunctionScoreQueryBuilder regFunctionScoreQ(QueryBuilder queryBuilder, Collection<FilterFunctionBuilder> list) {
+        FunctionScoreQueryBuilder functionScoreQuery =
+                QueryBuilders.functionScoreQuery(queryBuilder, list.toArray(new FilterFunctionBuilder[list.size()]));
         regQ(functionScoreQuery);
         return functionScoreQuery;
     }
@@ -197,7 +208,7 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
 
     protected IdsQueryBuilder regIdsQ(Collection<String> values) {
         checkEsInvalidQueryCollection("_id", values);
-        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values);
+        IdsQueryBuilder idsQuery = QueryBuilders.idsQuery(asTableDbName()).addIds(values.toArray(new String[values.size()]));
         regQ(idsQuery);
         return idsQuery;
     }
@@ -209,23 +220,23 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhraseQ(String name, Object value) {
+    protected MatchPhraseQueryBuilder regMatchPhraseQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
+        MatchPhraseQueryBuilder matchQuery = QueryBuilders.matchPhraseQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected MatchQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
+    protected MatchPhrasePrefixQueryBuilder regMatchPhrasePrefixQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        MatchQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
+        MatchPhrasePrefixQueryBuilder matchQuery = QueryBuilders.matchPhrasePrefixQuery(name, value);
         regQ(matchQuery);
         return matchQuery;
     }
 
-    protected FuzzyQueryBuilder regFuzzyQ(String name, Object value) {
+    protected MatchQueryBuilder regFuzzyQ(String name, Object value) {
         checkEsInvalidQuery(name, value);
-        FuzzyQueryBuilder fuzzyQuery = QueryBuilders.fuzzyQuery(name, value);
+        MatchQueryBuilder fuzzyQuery = QueryBuilders.matchQuery(name, value).fuzziness(Fuzziness.AUTO);
         regQ(fuzzyQuery);
         return fuzzyQuery;
     }
@@ -297,12 +308,19 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         return commonTermsQuery;
     }
 
-    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name) {
-        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(name);
+    protected MoreLikeThisQueryBuilder regMoreLikeThisQueryQ(String name, String[] likeTexts) {
+        MoreLikeThisQueryBuilder moreLikeThisQuery = QueryBuilders.moreLikeThisQuery(new String[] { name }, likeTexts, null);
         regQ(moreLikeThisQuery);
         return moreLikeThisQuery;
     }
 
+    protected SpanTermQueryBuilder regSpanTermQ(String name, String value) {
+        checkEsInvalidQuery(name, value);
+        SpanTermQueryBuilder spanTermQuery = QueryBuilders.spanTermQuery(name, value);
+        regQ(spanTermQuery);
+        return spanTermQuery;
+    }
+
     protected void regQ(QueryBuilder builder) {
         assertObjectNotNull("builder", builder);
         if (queryBuilderList == null) {
@@ -488,6 +506,28 @@ public abstract class EsAbstractConditionQuery implements ConditionQuery {
         }
     }
 
+    protected String toRangeDateString(Date date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.getTime());
+        } else if (format.contains("date_optional_time")) {
+            final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+            sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+            return sdf.format(date);
+        } else {
+            return Long.toString(date.getTime());
+        }
+    }
+
+    protected String toRangeLocalDateTimeString(LocalDateTime date, String format) {
+        if (format.contains("epoch_millis")) {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        } else if (format.contains("date_optional_time")) {
+            return DateTimeFormatter.ISO_DATE_TIME.format(date);
+        } else {
+            return Long.toString(date.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
+        }
+    }
+
     // ===================================================================================
     //                                                                        Assist Class
     //                                                                        ============
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
index ee513bffacbcfa034aa50d1e3f5a457573ce48ed..5dac83b71dccf5d2706009e106d9c4156d36f169 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/GroupDbm.java
@@ -117,7 +117,7 @@ public class GroupDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
index fef2f24b9faed2b466d28c7c15fb597a1face149..a973f1ed889568019ac8214e6f5be409375f20d3 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/RoleDbm.java
@@ -116,7 +116,7 @@ public class RoleDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnName() {
diff --git a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
index ab74db479f82fff8d69d226d3cbb55275d904cdc..d8e71e7cd7f5a8a97861c20ce38c9163d9036a6a 100644
--- a/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
+++ b/src/main/java/org/codelibs/fess/es/user/bsentity/dbmeta/UserDbm.java
@@ -174,90 +174,90 @@ public class UserDbm extends AbstractDBMeta {
     // ===================================================================================
     //                                                                         Column Info
     //                                                                         ===========
-    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "String", 0,
+    protected final ColumnInfo _columnName = cci("name", "name", null, null, String.class, "name", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPassword = cci("password", "password", null, null, String.class, "password", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnSurname = cci("surname", "surname", null, null, String.class, "surname", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGivenName = cci("givenName", "givenName", null, null, String.class, "givenName", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnEmployeeNumber = cci("employeeNumber", "employeeNumber", null, null, String.class, "employeeNumber",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "String", 0,
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnMail = cci("mail", "mail", null, null, String.class, "mail", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTelephoneNumber = cci("telephoneNumber", "telephoneNumber", null, null, String.class,
-            "telephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "telephoneNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHomePhone = cci("homePhone", "homePhone", null, null, String.class, "homePhone", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHomePostalAddress = cci("homePostalAddress", "homePostalAddress", null, null, String.class,
-            "homePostalAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "homePostalAddress", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnLabeledURI = cci("labeledURI", "labeledURI", null, null, String.class, "labeledURI", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoomNumber = cci("roomNumber", "roomNumber", null, null, String.class, "roomNumber", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDescription = cci("description", "description", null, null, String.class, "description", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnTitle = cci("title", "title", null, null, String.class, "title", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnPager = cci("pager", "pager", null, null, String.class, "pager", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnStreet = cci("street", "street", null, null, String.class, "street", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPostalCode = cci("postalCode", "postalCode", null, null, String.class, "postalCode", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPhysicalDeliveryOfficeName = cci("physicalDeliveryOfficeName", "physicalDeliveryOfficeName", null,
-            null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "String", 0, 0, null, false, null, null, null,
+            null, String.class, "physicalDeliveryOfficeName", null, false, false, false, "keyword", 0, 0, null, false, null, null, null,
             null, null, false);
     protected final ColumnInfo _columnDestinationIndicator = cci("destinationIndicator", "destinationIndicator", null, null, String.class,
-            "destinationIndicator", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "destinationIndicator", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnInternationaliSDNNumber = cci("internationaliSDNNumber", "internationaliSDNNumber", null, null,
-            String.class, "internationaliSDNNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null,
+            String.class, "internationaliSDNNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null,
             false);
-    protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false, "String",
-            0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnState = cci("state", "state", null, null, String.class, "state", null, false, false, false,
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnEmployeeType = cci("employeeType", "employeeType", null, null, String.class, "employeeType", null,
-            false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnFacsimileTelephoneNumber = cci("facsimileTelephoneNumber", "facsimileTelephoneNumber", null, null,
-            String.class, "facsimileTelephoneNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null,
-            false);
+            String.class, "facsimileTelephoneNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null,
+            null, false);
     protected final ColumnInfo _columnPostOfficeBox = cci("postOfficeBox", "postOfficeBox", null, null, String.class, "postOfficeBox",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnInitials = cci("initials", "initials", null, null, String.class, "initials", null, false, false,
-            false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnCarLicense = cci("carLicense", "carLicense", null, null, String.class, "carLicense", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnMobile = cci("mobile", "mobile", null, null, String.class, "mobile", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPostalAddress = cci("postalAddress", "postalAddress", null, null, String.class, "postalAddress",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
-    protected final ColumnInfo _columnCity = cci("city", "city", null, null, String.class, "city", null, false, false, false, "String", 0,
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
+    protected final ColumnInfo _columnCity = cci("city", "city", null, null, String.class, "city", null, false, false, false, "keyword", 0,
             0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnTeletexTerminalIdentifier = cci("teletexTerminalIdentifier", "teletexTerminalIdentifier", null, null,
-            String.class, "teletexTerminalIdentifier", null, false, false, false, "String", 0, 0, null, false, null, null, null, null,
+            String.class, "teletexTerminalIdentifier", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null,
             null, false);
     protected final ColumnInfo _columnX121Address = cci("x121Address", "x121Address", null, null, String.class, "x121Address", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnBusinessCategory = cci("businessCategory", "businessCategory", null, null, String.class,
-            "businessCategory", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "businessCategory", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRegisteredAddress = cci("registeredAddress", "registeredAddress", null, null, String.class,
-            "registeredAddress", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "registeredAddress", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDisplayName = cci("displayName", "displayName", null, null, String.class, "displayName", null, false,
-            false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnPreferredLanguage = cci("preferredLanguage", "preferredLanguage", null, null, String.class,
-            "preferredLanguage", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "preferredLanguage", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnDepartmentNumber = cci("departmentNumber", "departmentNumber", null, null, String.class,
-            "departmentNumber", null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            "departmentNumber", null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnUidNumber = cci("uidNumber", "uidNumber", null, null, Long.class, "uidNumber", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGidNumber = cci("gidNumber", "gidNumber", null, null, Long.class, "gidNumber", null, false, false,
             false, "Long", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnHomeDirectory = cci("homeDirectory", "homeDirectory", null, null, String.class, "homeDirectory",
-            null, false, false, false, "String", 0, 0, null, false, null, null, null, null, null, false);
+            null, false, false, false, "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnGroups = cci("groups", "groups", null, null, String[].class, "groups", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
     protected final ColumnInfo _columnRoles = cci("roles", "roles", null, null, String[].class, "roles", null, false, false, false,
-            "String", 0, 0, null, false, null, null, null, null, null, false);
+            "keyword", 0, 0, null, false, null, null, null, null, null, false);
 
     public ColumnInfo columnName() {
         return _columnName;
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
index 5801f694ce508812bab43620af0cdea3d57aa8a6..0dca13d129b3233624d2e0cb9cfe00a9dd212488 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsGroupCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.user.cbean.ca.GroupCA;
 import org.codelibs.fess.es.user.cbean.cq.GroupCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsGroupCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,34 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +134,18 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsGroupCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsGroupCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +160,16 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +184,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +199,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +214,16 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,17 +234,16 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long gidNumber
     public void setGidNumber_Avg() {
         setGidNumber_Avg(null);
     }
 
-    public void setGidNumber_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setGidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setGidNumber_Avg("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "gidNumber");
+    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -255,12 +253,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Max(null);
     }
 
-    public void setGidNumber_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setGidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setGidNumber_Max("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "gidNumber");
+    public void setGidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -270,12 +268,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Min(null);
     }
 
-    public void setGidNumber_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setGidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setGidNumber_Min("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "gidNumber");
+    public void setGidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -285,12 +283,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Sum(null);
     }
 
-    public void setGidNumber_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setGidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setGidNumber_Sum("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "gidNumber");
+    public void setGidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -300,12 +298,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_ExtendedStats(null);
     }
 
-    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setGidNumber_ExtendedStats("gidNumber", opLambda);
     }
 
-    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "gidNumber");
+    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -315,12 +313,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Stats(null);
     }
 
-    public void setGidNumber_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setGidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setGidNumber_Stats("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "gidNumber");
+    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -330,12 +328,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Percentiles(null);
     }
 
-    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setGidNumber_Percentiles("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "gidNumber");
+    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -345,12 +343,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_PercentileRanks(null);
     }
 
-    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setGidNumber_PercentileRanks("gidNumber", opLambda);
     }
 
-    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "gidNumber");
+    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -360,16 +358,17 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Histogram(null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setGidNumber_Histogram("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setGidNumber_Histogram("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "gidNumber");
+    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsGroupCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -384,16 +383,16 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Range(null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setGidNumber_Range("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setGidNumber_Range("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "gidNumber");
+    public void setGidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -408,12 +407,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Count(null);
     }
 
-    public void setGidNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGidNumber_Count("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "gidNumber");
+    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -423,12 +422,12 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Cardinality(null);
     }
 
-    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGidNumber_Cardinality("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "gidNumber");
+    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -438,16 +437,17 @@ public abstract class BsGroupCA extends EsAbstractConditionAggregation {
         setGidNumber_Missing(null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGidNumber_Missing("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
         setGidNumber_Missing("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsGroupCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "gidNumber");
+    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsGroupCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
index 80c3fbbca27f9e8e831f41a94fecc9691c18c65e..c48eb11377d2581806f0abb72f217a43b64bf369 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsRoleCA.java
@@ -21,16 +21,16 @@ import org.codelibs.fess.es.user.cbean.ca.RoleCA;
 import org.codelibs.fess.es.user.cbean.cq.RoleCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsRoleCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -58,8 +58,8 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -82,36 +82,34 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -126,17 +124,17 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsRoleCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -151,16 +149,16 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -175,12 +173,12 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -190,12 +188,12 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -205,16 +203,16 @@ public abstract class BsRoleCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsRoleCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
index a4e5fcc796f22920340cb763c979e2c0cc60f882..e75f6b56b7028d63583839c560c80832422a57aa 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/ca/bs/BsUserCA.java
@@ -21,26 +21,26 @@ import org.codelibs.fess.es.user.cbean.ca.UserCA;
 import org.codelibs.fess.es.user.cbean.cq.UserCQ;
 import org.codelibs.fess.es.user.cbean.cq.bs.BsUserCQ;
 import org.elasticsearch.search.aggregations.bucket.filter.FilterAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.global.GlobalBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.HistogramBuilder;
-import org.elasticsearch.search.aggregations.bucket.missing.MissingBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
-import org.elasticsearch.search.aggregations.bucket.range.ipv4.IPv4RangeBuilder;
+import org.elasticsearch.search.aggregations.bucket.global.GlobalAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.ip.IpRangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.SamplerAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
-import org.elasticsearch.search.aggregations.metrics.avg.AvgBuilder;
-import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityBuilder;
-import org.elasticsearch.search.aggregations.metrics.max.MaxBuilder;
-import org.elasticsearch.search.aggregations.metrics.min.MinBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksBuilder;
-import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesBuilder;
-import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.StatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsBuilder;
-import org.elasticsearch.search.aggregations.metrics.sum.SumBuilder;
-import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsBuilder;
-import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountBuilder;
+import org.elasticsearch.search.aggregations.bucket.significant.SignificantTermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.avg.AvgAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.cardinality.CardinalityAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentileRanksAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.percentiles.PercentilesAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.scripted.ScriptedMetricAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.StatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStatsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.sum.SumAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.tophits.TopHitsAggregationBuilder;
+import org.elasticsearch.search.aggregations.metrics.valuecount.ValueCountAggregationBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -68,8 +68,8 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void global(String name, ConditionOptionCall<GlobalBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        GlobalBuilder builder = regGlobalA(name);
+    public void global(String name, ConditionOptionCall<GlobalAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        GlobalAggregationBuilder builder = regGlobalA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -92,36 +92,34 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricBuilder> opLambda) {
-        ScriptedMetricBuilder builder = regScriptedMetricA(name);
+    public void scriptedMetric(String name, ConditionOptionCall<ScriptedMetricAggregationBuilder> opLambda) {
+        ScriptedMetricAggregationBuilder builder = regScriptedMetricA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    public void topHits(String name, ConditionOptionCall<TopHitsBuilder> opLambda) {
-        TopHitsBuilder builder = regTopHitsA(name);
+    public void topHits(String name, ConditionOptionCall<TopHitsAggregationBuilder> opLambda) {
+        TopHitsAggregationBuilder builder = regTopHitsA(name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
     }
 
-    // String name
-
     public void setName_Terms() {
         setName_Terms(null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setName_Terms("name", opLambda, null);
     }
 
-    public void setName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setName_Terms("name", opLambda, aggsLambda);
     }
 
-    public void setName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "name");
+    public void setName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -136,17 +134,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setName_SignificantTerms(null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setName_SignificantTerms("name", opLambda, null);
     }
 
-    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setName_SignificantTerms("name", opLambda, aggsLambda);
     }
 
-    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "name");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -161,16 +159,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setName_IpRange(null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setName_IpRange("name", opLambda, null);
     }
 
-    public void setName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setName_IpRange("name", opLambda, aggsLambda);
     }
 
-    public void setName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "name");
+    public void setName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -185,12 +183,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setName_Count(null);
     }
 
-    public void setName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setName_Count("name", opLambda);
     }
 
-    public void setName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "name");
+    public void setName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -200,12 +198,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setName_Cardinality(null);
     }
 
-    public void setName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setName_Cardinality("name", opLambda);
     }
 
-    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "name");
+    public void setName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -215,16 +213,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setName_Missing(null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setName_Missing("name", opLambda, null);
     }
 
-    public void setName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setName_Missing("name", opLambda, aggsLambda);
     }
 
-    public void setName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "name");
+    public void setName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "name");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -235,22 +233,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String password
-
     public void setPassword_Terms() {
         setPassword_Terms(null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPassword_Terms("password", opLambda, null);
     }
 
-    public void setPassword_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPassword_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPassword_Terms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "password");
+    public void setPassword_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -265,17 +261,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPassword_SignificantTerms(null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPassword_SignificantTerms("password", opLambda, null);
     }
 
-    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPassword_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPassword_SignificantTerms("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPassword_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "password");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -290,16 +287,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPassword_IpRange(null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPassword_IpRange("password", opLambda, null);
     }
 
-    public void setPassword_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPassword_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPassword_IpRange("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "password");
+    public void setPassword_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -314,12 +311,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPassword_Count(null);
     }
 
-    public void setPassword_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPassword_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPassword_Count("password", opLambda);
     }
 
-    public void setPassword_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "password");
+    public void setPassword_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -329,12 +326,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPassword_Cardinality(null);
     }
 
-    public void setPassword_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPassword_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPassword_Cardinality("password", opLambda);
     }
 
-    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "password");
+    public void setPassword_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -344,16 +341,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPassword_Missing(null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPassword_Missing("password", opLambda, null);
     }
 
-    public void setPassword_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPassword_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPassword_Missing("password", opLambda, aggsLambda);
     }
 
-    public void setPassword_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "password");
+    public void setPassword_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "password");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -364,22 +361,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String surname
-
     public void setSurname_Terms() {
         setSurname_Terms(null);
     }
 
-    public void setSurname_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setSurname_Terms("surname", opLambda, null);
     }
 
-    public void setSurname_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setSurname_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setSurname_Terms("surname", opLambda, aggsLambda);
     }
 
-    public void setSurname_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "surname");
+    public void setSurname_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -394,17 +389,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setSurname_SignificantTerms(null);
     }
 
-    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setSurname_SignificantTerms("surname", opLambda, null);
     }
 
-    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setSurname_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setSurname_SignificantTerms("surname", opLambda, aggsLambda);
     }
 
-    public void setSurname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setSurname_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "surname");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -419,16 +415,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setSurname_IpRange(null);
     }
 
-    public void setSurname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setSurname_IpRange("surname", opLambda, null);
     }
 
-    public void setSurname_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setSurname_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setSurname_IpRange("surname", opLambda, aggsLambda);
     }
 
-    public void setSurname_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "surname");
+    public void setSurname_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -443,12 +439,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setSurname_Count(null);
     }
 
-    public void setSurname_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setSurname_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setSurname_Count("surname", opLambda);
     }
 
-    public void setSurname_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "surname");
+    public void setSurname_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -458,12 +454,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setSurname_Cardinality(null);
     }
 
-    public void setSurname_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setSurname_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setSurname_Cardinality("surname", opLambda);
     }
 
-    public void setSurname_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "surname");
+    public void setSurname_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -473,16 +469,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setSurname_Missing(null);
     }
 
-    public void setSurname_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setSurname_Missing("surname", opLambda, null);
     }
 
-    public void setSurname_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setSurname_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setSurname_Missing("surname", opLambda, aggsLambda);
     }
 
-    public void setSurname_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "surname");
+    public void setSurname_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "surname");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -493,22 +489,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String givenName
-
     public void setGivenName_Terms() {
         setGivenName_Terms(null);
     }
 
-    public void setGivenName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setGivenName_Terms("givenName", opLambda, null);
     }
 
-    public void setGivenName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGivenName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGivenName_Terms("givenName", opLambda, aggsLambda);
     }
 
-    public void setGivenName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "givenName");
+    public void setGivenName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,17 +517,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGivenName_SignificantTerms(null);
     }
 
-    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setGivenName_SignificantTerms("givenName", opLambda, null);
     }
 
-    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGivenName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setGivenName_SignificantTerms("givenName", opLambda, aggsLambda);
     }
 
-    public void setGivenName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGivenName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "givenName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -548,16 +543,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGivenName_IpRange(null);
     }
 
-    public void setGivenName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setGivenName_IpRange("givenName", opLambda, null);
     }
 
-    public void setGivenName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGivenName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGivenName_IpRange("givenName", opLambda, aggsLambda);
     }
 
-    public void setGivenName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "givenName");
+    public void setGivenName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -572,12 +567,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGivenName_Count(null);
     }
 
-    public void setGivenName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGivenName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGivenName_Count("givenName", opLambda);
     }
 
-    public void setGivenName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "givenName");
+    public void setGivenName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -587,12 +582,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGivenName_Cardinality(null);
     }
 
-    public void setGivenName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGivenName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGivenName_Cardinality("givenName", opLambda);
     }
 
-    public void setGivenName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "givenName");
+    public void setGivenName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -602,16 +597,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGivenName_Missing(null);
     }
 
-    public void setGivenName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGivenName_Missing("givenName", opLambda, null);
     }
 
-    public void setGivenName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGivenName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGivenName_Missing("givenName", opLambda, aggsLambda);
     }
 
-    public void setGivenName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "givenName");
+    public void setGivenName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "givenName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -622,22 +617,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String employeeNumber
-
     public void setEmployeeNumber_Terms() {
         setEmployeeNumber_Terms(null);
     }
 
-    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setEmployeeNumber_Terms("employeeNumber", opLambda, null);
     }
 
-    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeNumber_Terms("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "employeeNumber");
+    public void setEmployeeNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -652,17 +646,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeNumber_SignificantTerms(null);
     }
 
-    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, null);
     }
 
-    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeNumber_SignificantTerms("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setEmployeeNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "employeeNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -677,16 +672,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeNumber_IpRange(null);
     }
 
-    public void setEmployeeNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setEmployeeNumber_IpRange("employeeNumber", opLambda, null);
     }
 
-    public void setEmployeeNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeNumber_IpRange("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "employeeNumber");
+    public void setEmployeeNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -701,12 +697,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeNumber_Count(null);
     }
 
-    public void setEmployeeNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setEmployeeNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setEmployeeNumber_Count("employeeNumber", opLambda);
     }
 
-    public void setEmployeeNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "employeeNumber");
+    public void setEmployeeNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -716,12 +712,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeNumber_Cardinality(null);
     }
 
-    public void setEmployeeNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setEmployeeNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setEmployeeNumber_Cardinality("employeeNumber", opLambda);
     }
 
-    public void setEmployeeNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "employeeNumber");
+    public void setEmployeeNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -731,16 +727,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeNumber_Missing(null);
     }
 
-    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setEmployeeNumber_Missing("employeeNumber", opLambda, null);
     }
 
-    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeNumber_Missing("employeeNumber", opLambda, aggsLambda);
     }
 
-    public void setEmployeeNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "employeeNumber");
+    public void setEmployeeNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "employeeNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -751,22 +748,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String mail
-
     public void setMail_Terms() {
         setMail_Terms(null);
     }
 
-    public void setMail_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setMail_Terms("mail", opLambda, null);
     }
 
-    public void setMail_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMail_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMail_Terms("mail", opLambda, aggsLambda);
     }
 
-    public void setMail_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "mail");
+    public void setMail_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -781,17 +776,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMail_SignificantTerms(null);
     }
 
-    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setMail_SignificantTerms("mail", opLambda, null);
     }
 
-    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMail_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMail_SignificantTerms("mail", opLambda, aggsLambda);
     }
 
-    public void setMail_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setMail_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "mail");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -806,16 +801,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMail_IpRange(null);
     }
 
-    public void setMail_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setMail_IpRange("mail", opLambda, null);
     }
 
-    public void setMail_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMail_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMail_IpRange("mail", opLambda, aggsLambda);
     }
 
-    public void setMail_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "mail");
+    public void setMail_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -830,12 +825,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMail_Count(null);
     }
 
-    public void setMail_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setMail_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setMail_Count("mail", opLambda);
     }
 
-    public void setMail_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "mail");
+    public void setMail_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -845,12 +840,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMail_Cardinality(null);
     }
 
-    public void setMail_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setMail_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setMail_Cardinality("mail", opLambda);
     }
 
-    public void setMail_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "mail");
+    public void setMail_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -860,16 +855,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMail_Missing(null);
     }
 
-    public void setMail_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setMail_Missing("mail", opLambda, null);
     }
 
-    public void setMail_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMail_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMail_Missing("mail", opLambda, aggsLambda);
     }
 
-    public void setMail_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "mail");
+    public void setMail_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "mail");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -880,22 +875,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String telephoneNumber
-
     public void setTelephoneNumber_Terms() {
         setTelephoneNumber_Terms(null);
     }
 
-    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTelephoneNumber_Terms("telephoneNumber", opLambda, null);
     }
 
-    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTelephoneNumber_Terms("telephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "telephoneNumber");
+    public void setTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -910,17 +904,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTelephoneNumber_SignificantTerms(null);
     }
 
-    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, null);
     }
 
-    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setTelephoneNumber_SignificantTerms("telephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "telephoneNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -935,16 +930,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTelephoneNumber_IpRange(null);
     }
 
-    public void setTelephoneNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTelephoneNumber_IpRange("telephoneNumber", opLambda, null);
     }
 
-    public void setTelephoneNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTelephoneNumber_IpRange("telephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "telephoneNumber");
+    public void setTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,12 +955,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTelephoneNumber_Count(null);
     }
 
-    public void setTelephoneNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTelephoneNumber_Count("telephoneNumber", opLambda);
     }
 
-    public void setTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "telephoneNumber");
+    public void setTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -974,12 +970,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTelephoneNumber_Cardinality(null);
     }
 
-    public void setTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTelephoneNumber_Cardinality("telephoneNumber", opLambda);
     }
 
-    public void setTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "telephoneNumber");
+    public void setTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -989,16 +985,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTelephoneNumber_Missing(null);
     }
 
-    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTelephoneNumber_Missing("telephoneNumber", opLambda, null);
     }
 
-    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTelephoneNumber_Missing("telephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setTelephoneNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "telephoneNumber");
+    public void setTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "telephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1009,22 +1006,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String homePhone
-
     public void setHomePhone_Terms() {
         setHomePhone_Terms(null);
     }
 
-    public void setHomePhone_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHomePhone_Terms("homePhone", opLambda, null);
     }
 
-    public void setHomePhone_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePhone_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePhone_Terms("homePhone", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "homePhone");
+    public void setHomePhone_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1039,17 +1034,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePhone_SignificantTerms(null);
     }
 
-    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHomePhone_SignificantTerms("homePhone", opLambda, null);
     }
 
-    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePhone_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setHomePhone_SignificantTerms("homePhone", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHomePhone_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "homePhone");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1064,16 +1060,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePhone_IpRange(null);
     }
 
-    public void setHomePhone_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHomePhone_IpRange("homePhone", opLambda, null);
     }
 
-    public void setHomePhone_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePhone_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePhone_IpRange("homePhone", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "homePhone");
+    public void setHomePhone_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,12 +1084,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePhone_Count(null);
     }
 
-    public void setHomePhone_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHomePhone_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHomePhone_Count("homePhone", opLambda);
     }
 
-    public void setHomePhone_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "homePhone");
+    public void setHomePhone_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1103,12 +1099,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePhone_Cardinality(null);
     }
 
-    public void setHomePhone_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHomePhone_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHomePhone_Cardinality("homePhone", opLambda);
     }
 
-    public void setHomePhone_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "homePhone");
+    public void setHomePhone_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1118,16 +1114,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePhone_Missing(null);
     }
 
-    public void setHomePhone_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHomePhone_Missing("homePhone", opLambda, null);
     }
 
-    public void setHomePhone_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePhone_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePhone_Missing("homePhone", opLambda, aggsLambda);
     }
 
-    public void setHomePhone_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "homePhone");
+    public void setHomePhone_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "homePhone");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1138,22 +1134,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String homePostalAddress
-
     public void setHomePostalAddress_Terms() {
         setHomePostalAddress_Terms(null);
     }
 
-    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHomePostalAddress_Terms("homePostalAddress", opLambda, null);
     }
 
-    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePostalAddress_Terms("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "homePostalAddress");
+    public void setHomePostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1168,18 +1163,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePostalAddress_SignificantTerms(null);
     }
 
-    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, null);
     }
 
-    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHomePostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setHomePostalAddress_SignificantTerms("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHomePostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "homePostalAddress");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1194,16 +1189,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePostalAddress_IpRange(null);
     }
 
-    public void setHomePostalAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHomePostalAddress_IpRange("homePostalAddress", opLambda, null);
     }
 
-    public void setHomePostalAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePostalAddress_IpRange("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "homePostalAddress");
+    public void setHomePostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1218,12 +1214,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePostalAddress_Count(null);
     }
 
-    public void setHomePostalAddress_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHomePostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHomePostalAddress_Count("homePostalAddress", opLambda);
     }
 
-    public void setHomePostalAddress_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "homePostalAddress");
+    public void setHomePostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1233,12 +1229,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePostalAddress_Cardinality(null);
     }
 
-    public void setHomePostalAddress_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHomePostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHomePostalAddress_Cardinality("homePostalAddress", opLambda);
     }
 
-    public void setHomePostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "homePostalAddress");
+    public void setHomePostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1248,16 +1244,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomePostalAddress_Missing(null);
     }
 
-    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHomePostalAddress_Missing("homePostalAddress", opLambda, null);
     }
 
-    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomePostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomePostalAddress_Missing("homePostalAddress", opLambda, aggsLambda);
     }
 
-    public void setHomePostalAddress_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "homePostalAddress");
+    public void setHomePostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "homePostalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1268,22 +1265,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String labeledURI
-
     public void setLabeledURI_Terms() {
         setLabeledURI_Terms(null);
     }
 
-    public void setLabeledURI_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setLabeledURI_Terms("labeledURI", opLambda, null);
     }
 
-    public void setLabeledURI_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setLabeledURI_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setLabeledURI_Terms("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "labeledURI");
+    public void setLabeledURI_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1298,17 +1293,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setLabeledURI_SignificantTerms(null);
     }
 
-    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setLabeledURI_SignificantTerms("labeledURI", opLambda, null);
     }
 
-    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setLabeledURI_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setLabeledURI_SignificantTerms("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setLabeledURI_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "labeledURI");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1323,16 +1319,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setLabeledURI_IpRange(null);
     }
 
-    public void setLabeledURI_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setLabeledURI_IpRange("labeledURI", opLambda, null);
     }
 
-    public void setLabeledURI_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setLabeledURI_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setLabeledURI_IpRange("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "labeledURI");
+    public void setLabeledURI_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1347,12 +1344,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setLabeledURI_Count(null);
     }
 
-    public void setLabeledURI_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setLabeledURI_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setLabeledURI_Count("labeledURI", opLambda);
     }
 
-    public void setLabeledURI_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "labeledURI");
+    public void setLabeledURI_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1362,12 +1359,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setLabeledURI_Cardinality(null);
     }
 
-    public void setLabeledURI_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setLabeledURI_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setLabeledURI_Cardinality("labeledURI", opLambda);
     }
 
-    public void setLabeledURI_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "labeledURI");
+    public void setLabeledURI_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1377,16 +1374,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setLabeledURI_Missing(null);
     }
 
-    public void setLabeledURI_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setLabeledURI_Missing("labeledURI", opLambda, null);
     }
 
-    public void setLabeledURI_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setLabeledURI_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setLabeledURI_Missing("labeledURI", opLambda, aggsLambda);
     }
 
-    public void setLabeledURI_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "labeledURI");
+    public void setLabeledURI_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "labeledURI");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1397,22 +1395,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String roomNumber
-
     public void setRoomNumber_Terms() {
         setRoomNumber_Terms(null);
     }
 
-    public void setRoomNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoomNumber_Terms("roomNumber", opLambda, null);
     }
 
-    public void setRoomNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoomNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoomNumber_Terms("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setRoomNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roomNumber");
+    public void setRoomNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1427,17 +1423,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoomNumber_SignificantTerms(null);
     }
 
-    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoomNumber_SignificantTerms("roomNumber", opLambda, null);
     }
 
-    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoomNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setRoomNumber_SignificantTerms("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setRoomNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoomNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roomNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1452,16 +1449,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoomNumber_IpRange(null);
     }
 
-    public void setRoomNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoomNumber_IpRange("roomNumber", opLambda, null);
     }
 
-    public void setRoomNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoomNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoomNumber_IpRange("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setRoomNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roomNumber");
+    public void setRoomNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1476,12 +1474,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoomNumber_Count(null);
     }
 
-    public void setRoomNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoomNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoomNumber_Count("roomNumber", opLambda);
     }
 
-    public void setRoomNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roomNumber");
+    public void setRoomNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1491,12 +1489,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoomNumber_Cardinality(null);
     }
 
-    public void setRoomNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoomNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoomNumber_Cardinality("roomNumber", opLambda);
     }
 
-    public void setRoomNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roomNumber");
+    public void setRoomNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1506,16 +1504,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoomNumber_Missing(null);
     }
 
-    public void setRoomNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoomNumber_Missing("roomNumber", opLambda, null);
     }
 
-    public void setRoomNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoomNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoomNumber_Missing("roomNumber", opLambda, aggsLambda);
     }
 
-    public void setRoomNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roomNumber");
+    public void setRoomNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roomNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1526,22 +1525,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String description
-
     public void setDescription_Terms() {
         setDescription_Terms(null);
     }
 
-    public void setDescription_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDescription_Terms("description", opLambda, null);
     }
 
-    public void setDescription_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDescription_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDescription_Terms("description", opLambda, aggsLambda);
     }
 
-    public void setDescription_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "description");
+    public void setDescription_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1556,17 +1553,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDescription_SignificantTerms(null);
     }
 
-    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDescription_SignificantTerms("description", opLambda, null);
     }
 
-    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDescription_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setDescription_SignificantTerms("description", opLambda, aggsLambda);
     }
 
-    public void setDescription_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDescription_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "description");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1581,16 +1579,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDescription_IpRange(null);
     }
 
-    public void setDescription_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDescription_IpRange("description", opLambda, null);
     }
 
-    public void setDescription_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDescription_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDescription_IpRange("description", opLambda, aggsLambda);
     }
 
-    public void setDescription_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "description");
+    public void setDescription_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1605,12 +1604,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDescription_Count(null);
     }
 
-    public void setDescription_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDescription_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDescription_Count("description", opLambda);
     }
 
-    public void setDescription_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "description");
+    public void setDescription_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1620,12 +1619,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDescription_Cardinality(null);
     }
 
-    public void setDescription_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDescription_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDescription_Cardinality("description", opLambda);
     }
 
-    public void setDescription_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "description");
+    public void setDescription_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1635,16 +1634,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDescription_Missing(null);
     }
 
-    public void setDescription_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDescription_Missing("description", opLambda, null);
     }
 
-    public void setDescription_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDescription_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDescription_Missing("description", opLambda, aggsLambda);
     }
 
-    public void setDescription_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "description");
+    public void setDescription_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "description");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1655,22 +1655,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String title
-
     public void setTitle_Terms() {
         setTitle_Terms(null);
     }
 
-    public void setTitle_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTitle_Terms("title", opLambda, null);
     }
 
-    public void setTitle_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTitle_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTitle_Terms("title", opLambda, aggsLambda);
     }
 
-    public void setTitle_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "title");
+    public void setTitle_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1685,17 +1683,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTitle_SignificantTerms(null);
     }
 
-    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTitle_SignificantTerms("title", opLambda, null);
     }
 
-    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTitle_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setTitle_SignificantTerms("title", opLambda, aggsLambda);
     }
 
-    public void setTitle_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTitle_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "title");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1710,16 +1709,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTitle_IpRange(null);
     }
 
-    public void setTitle_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTitle_IpRange("title", opLambda, null);
     }
 
-    public void setTitle_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTitle_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTitle_IpRange("title", opLambda, aggsLambda);
     }
 
-    public void setTitle_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "title");
+    public void setTitle_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1734,12 +1733,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTitle_Count(null);
     }
 
-    public void setTitle_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTitle_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTitle_Count("title", opLambda);
     }
 
-    public void setTitle_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "title");
+    public void setTitle_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1749,12 +1748,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTitle_Cardinality(null);
     }
 
-    public void setTitle_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTitle_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTitle_Cardinality("title", opLambda);
     }
 
-    public void setTitle_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "title");
+    public void setTitle_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1764,16 +1763,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTitle_Missing(null);
     }
 
-    public void setTitle_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTitle_Missing("title", opLambda, null);
     }
 
-    public void setTitle_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTitle_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTitle_Missing("title", opLambda, aggsLambda);
     }
 
-    public void setTitle_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "title");
+    public void setTitle_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "title");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1784,22 +1783,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String pager
-
     public void setPager_Terms() {
         setPager_Terms(null);
     }
 
-    public void setPager_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPager_Terms("pager", opLambda, null);
     }
 
-    public void setPager_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPager_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPager_Terms("pager", opLambda, aggsLambda);
     }
 
-    public void setPager_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "pager");
+    public void setPager_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1814,17 +1811,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPager_SignificantTerms(null);
     }
 
-    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPager_SignificantTerms("pager", opLambda, null);
     }
 
-    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPager_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPager_SignificantTerms("pager", opLambda, aggsLambda);
     }
 
-    public void setPager_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPager_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "pager");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1839,16 +1837,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPager_IpRange(null);
     }
 
-    public void setPager_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPager_IpRange("pager", opLambda, null);
     }
 
-    public void setPager_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPager_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPager_IpRange("pager", opLambda, aggsLambda);
     }
 
-    public void setPager_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "pager");
+    public void setPager_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1863,12 +1861,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPager_Count(null);
     }
 
-    public void setPager_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPager_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPager_Count("pager", opLambda);
     }
 
-    public void setPager_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "pager");
+    public void setPager_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1878,12 +1876,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPager_Cardinality(null);
     }
 
-    public void setPager_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPager_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPager_Cardinality("pager", opLambda);
     }
 
-    public void setPager_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "pager");
+    public void setPager_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1893,16 +1891,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPager_Missing(null);
     }
 
-    public void setPager_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPager_Missing("pager", opLambda, null);
     }
 
-    public void setPager_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPager_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPager_Missing("pager", opLambda, aggsLambda);
     }
 
-    public void setPager_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "pager");
+    public void setPager_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "pager");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1913,22 +1911,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String street
-
     public void setStreet_Terms() {
         setStreet_Terms(null);
     }
 
-    public void setStreet_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setStreet_Terms("street", opLambda, null);
     }
 
-    public void setStreet_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setStreet_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setStreet_Terms("street", opLambda, aggsLambda);
     }
 
-    public void setStreet_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "street");
+    public void setStreet_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1943,17 +1939,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setStreet_SignificantTerms(null);
     }
 
-    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setStreet_SignificantTerms("street", opLambda, null);
     }
 
-    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setStreet_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setStreet_SignificantTerms("street", opLambda, aggsLambda);
     }
 
-    public void setStreet_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setStreet_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "street");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1968,16 +1965,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setStreet_IpRange(null);
     }
 
-    public void setStreet_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setStreet_IpRange("street", opLambda, null);
     }
 
-    public void setStreet_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setStreet_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setStreet_IpRange("street", opLambda, aggsLambda);
     }
 
-    public void setStreet_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "street");
+    public void setStreet_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1992,12 +1989,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setStreet_Count(null);
     }
 
-    public void setStreet_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setStreet_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setStreet_Count("street", opLambda);
     }
 
-    public void setStreet_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "street");
+    public void setStreet_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2007,12 +2004,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setStreet_Cardinality(null);
     }
 
-    public void setStreet_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setStreet_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setStreet_Cardinality("street", opLambda);
     }
 
-    public void setStreet_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "street");
+    public void setStreet_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2022,16 +2019,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setStreet_Missing(null);
     }
 
-    public void setStreet_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setStreet_Missing("street", opLambda, null);
     }
 
-    public void setStreet_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setStreet_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setStreet_Missing("street", opLambda, aggsLambda);
     }
 
-    public void setStreet_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "street");
+    public void setStreet_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "street");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2042,22 +2039,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String postalCode
-
     public void setPostalCode_Terms() {
         setPostalCode_Terms(null);
     }
 
-    public void setPostalCode_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPostalCode_Terms("postalCode", opLambda, null);
     }
 
-    public void setPostalCode_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalCode_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalCode_Terms("postalCode", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "postalCode");
+    public void setPostalCode_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2072,17 +2067,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalCode_SignificantTerms(null);
     }
 
-    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPostalCode_SignificantTerms("postalCode", opLambda, null);
     }
 
-    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalCode_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPostalCode_SignificantTerms("postalCode", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPostalCode_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "postalCode");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2097,16 +2093,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalCode_IpRange(null);
     }
 
-    public void setPostalCode_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPostalCode_IpRange("postalCode", opLambda, null);
     }
 
-    public void setPostalCode_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalCode_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalCode_IpRange("postalCode", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "postalCode");
+    public void setPostalCode_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2121,12 +2118,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalCode_Count(null);
     }
 
-    public void setPostalCode_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPostalCode_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPostalCode_Count("postalCode", opLambda);
     }
 
-    public void setPostalCode_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "postalCode");
+    public void setPostalCode_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2136,12 +2133,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalCode_Cardinality(null);
     }
 
-    public void setPostalCode_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPostalCode_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPostalCode_Cardinality("postalCode", opLambda);
     }
 
-    public void setPostalCode_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "postalCode");
+    public void setPostalCode_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2151,16 +2148,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalCode_Missing(null);
     }
 
-    public void setPostalCode_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPostalCode_Missing("postalCode", opLambda, null);
     }
 
-    public void setPostalCode_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalCode_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalCode_Missing("postalCode", opLambda, aggsLambda);
     }
 
-    public void setPostalCode_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "postalCode");
+    public void setPostalCode_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "postalCode");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2171,23 +2169,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String physicalDeliveryOfficeName
-
     public void setPhysicalDeliveryOfficeName_Terms() {
         setPhysicalDeliveryOfficeName_Terms(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPhysicalDeliveryOfficeName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPhysicalDeliveryOfficeName_Terms("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setPhysicalDeliveryOfficeName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "physicalDeliveryOfficeName");
+        TermsAggregationBuilder builder = regTermsA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2202,18 +2198,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPhysicalDeliveryOfficeName_SignificantTerms(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setPhysicalDeliveryOfficeName_SignificantTerms("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "physicalDeliveryOfficeName");
+    public void setPhysicalDeliveryOfficeName_SignificantTerms(String name,
+            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2228,17 +2224,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPhysicalDeliveryOfficeName_IpRange(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPhysicalDeliveryOfficeName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPhysicalDeliveryOfficeName_IpRange("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setPhysicalDeliveryOfficeName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "physicalDeliveryOfficeName");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2253,12 +2250,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPhysicalDeliveryOfficeName_Count(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_Count("physicalDeliveryOfficeName", opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "physicalDeliveryOfficeName");
+    public void setPhysicalDeliveryOfficeName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2268,12 +2265,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPhysicalDeliveryOfficeName_Cardinality(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_Cardinality("physicalDeliveryOfficeName", opLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "physicalDeliveryOfficeName");
+    public void setPhysicalDeliveryOfficeName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2283,17 +2280,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPhysicalDeliveryOfficeName_Missing(null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPhysicalDeliveryOfficeName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPhysicalDeliveryOfficeName_Missing("physicalDeliveryOfficeName", opLambda, aggsLambda);
     }
 
-    public void setPhysicalDeliveryOfficeName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setPhysicalDeliveryOfficeName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "physicalDeliveryOfficeName");
+        MissingAggregationBuilder builder = regMissingA(name, "physicalDeliveryOfficeName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2304,22 +2302,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String destinationIndicator
-
     public void setDestinationIndicator_Terms() {
         setDestinationIndicator_Terms(null);
     }
 
-    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDestinationIndicator_Terms("destinationIndicator", opLambda, null);
     }
 
-    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDestinationIndicator_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDestinationIndicator_Terms("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "destinationIndicator");
+    public void setDestinationIndicator_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2334,18 +2331,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDestinationIndicator_SignificantTerms(null);
     }
 
-    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, null);
     }
 
-    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDestinationIndicator_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setDestinationIndicator_SignificantTerms("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDestinationIndicator_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "destinationIndicator");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2360,17 +2357,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDestinationIndicator_IpRange(null);
     }
 
-    public void setDestinationIndicator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDestinationIndicator_IpRange("destinationIndicator", opLambda, null);
     }
 
-    public void setDestinationIndicator_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDestinationIndicator_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDestinationIndicator_IpRange("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setDestinationIndicator_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "destinationIndicator");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2385,12 +2382,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDestinationIndicator_Count(null);
     }
 
-    public void setDestinationIndicator_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDestinationIndicator_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDestinationIndicator_Count("destinationIndicator", opLambda);
     }
 
-    public void setDestinationIndicator_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "destinationIndicator");
+    public void setDestinationIndicator_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2400,12 +2397,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDestinationIndicator_Cardinality(null);
     }
 
-    public void setDestinationIndicator_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDestinationIndicator_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDestinationIndicator_Cardinality("destinationIndicator", opLambda);
     }
 
-    public void setDestinationIndicator_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "destinationIndicator");
+    public void setDestinationIndicator_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2415,16 +2412,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDestinationIndicator_Missing(null);
     }
 
-    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDestinationIndicator_Missing("destinationIndicator", opLambda, null);
     }
 
-    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDestinationIndicator_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDestinationIndicator_Missing("destinationIndicator", opLambda, aggsLambda);
     }
 
-    public void setDestinationIndicator_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "destinationIndicator");
+    public void setDestinationIndicator_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "destinationIndicator");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2435,22 +2433,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String internationaliSDNNumber
-
     public void setInternationaliSDNNumber_Terms() {
         setInternationaliSDNNumber_Terms(null);
     }
 
-    public void setInternationaliSDNNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setInternationaliSDNNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_Terms("internationaliSDNNumber", opLambda, null);
     }
 
-    public void setInternationaliSDNNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInternationaliSDNNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setInternationaliSDNNumber_Terms("internationaliSDNNumber", opLambda, aggsLambda);
     }
 
-    public void setInternationaliSDNNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "internationaliSDNNumber");
+    public void setInternationaliSDNNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2465,18 +2462,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInternationaliSDNNumber_SignificantTerms(null);
     }
 
-    public void setInternationaliSDNNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setInternationaliSDNNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_SignificantTerms("internationaliSDNNumber", opLambda, null);
     }
 
-    public void setInternationaliSDNNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setInternationaliSDNNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setInternationaliSDNNumber_SignificantTerms("internationaliSDNNumber", opLambda, aggsLambda);
     }
 
-    public void setInternationaliSDNNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setInternationaliSDNNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "internationaliSDNNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2491,17 +2488,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInternationaliSDNNumber_IpRange(null);
     }
 
-    public void setInternationaliSDNNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setInternationaliSDNNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_IpRange("internationaliSDNNumber", opLambda, null);
     }
 
-    public void setInternationaliSDNNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInternationaliSDNNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setInternationaliSDNNumber_IpRange("internationaliSDNNumber", opLambda, aggsLambda);
     }
 
-    public void setInternationaliSDNNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setInternationaliSDNNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "internationaliSDNNumber");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2516,12 +2514,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInternationaliSDNNumber_Count(null);
     }
 
-    public void setInternationaliSDNNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setInternationaliSDNNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_Count("internationaliSDNNumber", opLambda);
     }
 
-    public void setInternationaliSDNNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "internationaliSDNNumber");
+    public void setInternationaliSDNNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2531,12 +2529,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInternationaliSDNNumber_Cardinality(null);
     }
 
-    public void setInternationaliSDNNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setInternationaliSDNNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_Cardinality("internationaliSDNNumber", opLambda);
     }
 
-    public void setInternationaliSDNNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "internationaliSDNNumber");
+    public void setInternationaliSDNNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2546,17 +2544,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInternationaliSDNNumber_Missing(null);
     }
 
-    public void setInternationaliSDNNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setInternationaliSDNNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setInternationaliSDNNumber_Missing("internationaliSDNNumber", opLambda, null);
     }
 
-    public void setInternationaliSDNNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInternationaliSDNNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setInternationaliSDNNumber_Missing("internationaliSDNNumber", opLambda, aggsLambda);
     }
 
-    public void setInternationaliSDNNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setInternationaliSDNNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "internationaliSDNNumber");
+        MissingAggregationBuilder builder = regMissingA(name, "internationaliSDNNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2567,22 +2566,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String state
-
     public void setState_Terms() {
         setState_Terms(null);
     }
 
-    public void setState_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setState_Terms("state", opLambda, null);
     }
 
-    public void setState_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setState_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setState_Terms("state", opLambda, aggsLambda);
     }
 
-    public void setState_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "state");
+    public void setState_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2597,17 +2594,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setState_SignificantTerms(null);
     }
 
-    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setState_SignificantTerms("state", opLambda, null);
     }
 
-    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setState_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setState_SignificantTerms("state", opLambda, aggsLambda);
     }
 
-    public void setState_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setState_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "state");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2622,16 +2620,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setState_IpRange(null);
     }
 
-    public void setState_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setState_IpRange("state", opLambda, null);
     }
 
-    public void setState_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setState_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setState_IpRange("state", opLambda, aggsLambda);
     }
 
-    public void setState_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "state");
+    public void setState_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2646,12 +2644,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setState_Count(null);
     }
 
-    public void setState_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setState_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setState_Count("state", opLambda);
     }
 
-    public void setState_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "state");
+    public void setState_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2661,12 +2659,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setState_Cardinality(null);
     }
 
-    public void setState_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setState_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setState_Cardinality("state", opLambda);
     }
 
-    public void setState_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "state");
+    public void setState_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2676,16 +2674,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setState_Missing(null);
     }
 
-    public void setState_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setState_Missing("state", opLambda, null);
     }
 
-    public void setState_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setState_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setState_Missing("state", opLambda, aggsLambda);
     }
 
-    public void setState_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "state");
+    public void setState_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "state");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2696,22 +2694,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String employeeType
-
     public void setEmployeeType_Terms() {
         setEmployeeType_Terms(null);
     }
 
-    public void setEmployeeType_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setEmployeeType_Terms("employeeType", opLambda, null);
     }
 
-    public void setEmployeeType_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeType_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeType_Terms("employeeType", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "employeeType");
+    public void setEmployeeType_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2726,17 +2722,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeType_SignificantTerms(null);
     }
 
-    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setEmployeeType_SignificantTerms("employeeType", opLambda, null);
     }
 
-    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeType_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeType_SignificantTerms("employeeType", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setEmployeeType_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "employeeType");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2751,16 +2748,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeType_IpRange(null);
     }
 
-    public void setEmployeeType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setEmployeeType_IpRange("employeeType", opLambda, null);
     }
 
-    public void setEmployeeType_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeType_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeType_IpRange("employeeType", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "employeeType");
+    public void setEmployeeType_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2775,12 +2773,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeType_Count(null);
     }
 
-    public void setEmployeeType_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setEmployeeType_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setEmployeeType_Count("employeeType", opLambda);
     }
 
-    public void setEmployeeType_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "employeeType");
+    public void setEmployeeType_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2790,12 +2788,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeType_Cardinality(null);
     }
 
-    public void setEmployeeType_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setEmployeeType_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setEmployeeType_Cardinality("employeeType", opLambda);
     }
 
-    public void setEmployeeType_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "employeeType");
+    public void setEmployeeType_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2805,16 +2803,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setEmployeeType_Missing(null);
     }
 
-    public void setEmployeeType_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setEmployeeType_Missing("employeeType", opLambda, null);
     }
 
-    public void setEmployeeType_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setEmployeeType_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setEmployeeType_Missing("employeeType", opLambda, aggsLambda);
     }
 
-    public void setEmployeeType_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "employeeType");
+    public void setEmployeeType_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "employeeType");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2825,22 +2824,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String facsimileTelephoneNumber
-
     public void setFacsimileTelephoneNumber_Terms() {
         setFacsimileTelephoneNumber_Terms(null);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setFacsimileTelephoneNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setFacsimileTelephoneNumber_Terms("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "facsimileTelephoneNumber");
+    public void setFacsimileTelephoneNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2855,18 +2853,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setFacsimileTelephoneNumber_SignificantTerms(null);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setFacsimileTelephoneNumber_SignificantTerms("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "facsimileTelephoneNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2881,17 +2879,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setFacsimileTelephoneNumber_IpRange(null);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setFacsimileTelephoneNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setFacsimileTelephoneNumber_IpRange("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "facsimileTelephoneNumber");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2906,12 +2905,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setFacsimileTelephoneNumber_Count(null);
     }
 
-    public void setFacsimileTelephoneNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_Count("facsimileTelephoneNumber", opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "facsimileTelephoneNumber");
+    public void setFacsimileTelephoneNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2921,12 +2920,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setFacsimileTelephoneNumber_Cardinality(null);
     }
 
-    public void setFacsimileTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_Cardinality("facsimileTelephoneNumber", opLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "facsimileTelephoneNumber");
+    public void setFacsimileTelephoneNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2936,17 +2935,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setFacsimileTelephoneNumber_Missing(null);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, null);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setFacsimileTelephoneNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setFacsimileTelephoneNumber_Missing("facsimileTelephoneNumber", opLambda, aggsLambda);
     }
 
-    public void setFacsimileTelephoneNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setFacsimileTelephoneNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "facsimileTelephoneNumber");
+        MissingAggregationBuilder builder = regMissingA(name, "facsimileTelephoneNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2957,22 +2957,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String postOfficeBox
-
     public void setPostOfficeBox_Terms() {
         setPostOfficeBox_Terms(null);
     }
 
-    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPostOfficeBox_Terms("postOfficeBox", opLambda, null);
     }
 
-    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostOfficeBox_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostOfficeBox_Terms("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "postOfficeBox");
+    public void setPostOfficeBox_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2987,17 +2985,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostOfficeBox_SignificantTerms(null);
     }
 
-    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, null);
     }
 
-    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostOfficeBox_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPostOfficeBox_SignificantTerms("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPostOfficeBox_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "postOfficeBox");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3012,16 +3011,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostOfficeBox_IpRange(null);
     }
 
-    public void setPostOfficeBox_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPostOfficeBox_IpRange("postOfficeBox", opLambda, null);
     }
 
-    public void setPostOfficeBox_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostOfficeBox_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostOfficeBox_IpRange("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "postOfficeBox");
+    public void setPostOfficeBox_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3036,12 +3036,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostOfficeBox_Count(null);
     }
 
-    public void setPostOfficeBox_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPostOfficeBox_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPostOfficeBox_Count("postOfficeBox", opLambda);
     }
 
-    public void setPostOfficeBox_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "postOfficeBox");
+    public void setPostOfficeBox_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3051,12 +3051,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostOfficeBox_Cardinality(null);
     }
 
-    public void setPostOfficeBox_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPostOfficeBox_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPostOfficeBox_Cardinality("postOfficeBox", opLambda);
     }
 
-    public void setPostOfficeBox_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "postOfficeBox");
+    public void setPostOfficeBox_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3066,16 +3066,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostOfficeBox_Missing(null);
     }
 
-    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPostOfficeBox_Missing("postOfficeBox", opLambda, null);
     }
 
-    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostOfficeBox_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostOfficeBox_Missing("postOfficeBox", opLambda, aggsLambda);
     }
 
-    public void setPostOfficeBox_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "postOfficeBox");
+    public void setPostOfficeBox_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "postOfficeBox");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3086,22 +3087,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String initials
-
     public void setInitials_Terms() {
         setInitials_Terms(null);
     }
 
-    public void setInitials_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setInitials_Terms("initials", opLambda, null);
     }
 
-    public void setInitials_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInitials_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setInitials_Terms("initials", opLambda, aggsLambda);
     }
 
-    public void setInitials_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "initials");
+    public void setInitials_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3116,17 +3115,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInitials_SignificantTerms(null);
     }
 
-    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setInitials_SignificantTerms("initials", opLambda, null);
     }
 
-    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInitials_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setInitials_SignificantTerms("initials", opLambda, aggsLambda);
     }
 
-    public void setInitials_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setInitials_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "initials");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3141,16 +3141,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInitials_IpRange(null);
     }
 
-    public void setInitials_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setInitials_IpRange("initials", opLambda, null);
     }
 
-    public void setInitials_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInitials_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setInitials_IpRange("initials", opLambda, aggsLambda);
     }
 
-    public void setInitials_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "initials");
+    public void setInitials_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3165,12 +3165,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInitials_Count(null);
     }
 
-    public void setInitials_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setInitials_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setInitials_Count("initials", opLambda);
     }
 
-    public void setInitials_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "initials");
+    public void setInitials_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3180,12 +3180,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInitials_Cardinality(null);
     }
 
-    public void setInitials_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setInitials_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setInitials_Cardinality("initials", opLambda);
     }
 
-    public void setInitials_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "initials");
+    public void setInitials_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3195,16 +3195,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setInitials_Missing(null);
     }
 
-    public void setInitials_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setInitials_Missing("initials", opLambda, null);
     }
 
-    public void setInitials_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setInitials_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setInitials_Missing("initials", opLambda, aggsLambda);
     }
 
-    public void setInitials_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "initials");
+    public void setInitials_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "initials");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3215,22 +3215,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String carLicense
-
     public void setCarLicense_Terms() {
         setCarLicense_Terms(null);
     }
 
-    public void setCarLicense_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCarLicense_Terms("carLicense", opLambda, null);
     }
 
-    public void setCarLicense_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCarLicense_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCarLicense_Terms("carLicense", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "carLicense");
+    public void setCarLicense_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3245,17 +3243,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCarLicense_SignificantTerms(null);
     }
 
-    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCarLicense_SignificantTerms("carLicense", opLambda, null);
     }
 
-    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCarLicense_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setCarLicense_SignificantTerms("carLicense", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCarLicense_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "carLicense");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3270,16 +3269,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCarLicense_IpRange(null);
     }
 
-    public void setCarLicense_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCarLicense_IpRange("carLicense", opLambda, null);
     }
 
-    public void setCarLicense_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCarLicense_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCarLicense_IpRange("carLicense", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "carLicense");
+    public void setCarLicense_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3294,12 +3294,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCarLicense_Count(null);
     }
 
-    public void setCarLicense_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCarLicense_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCarLicense_Count("carLicense", opLambda);
     }
 
-    public void setCarLicense_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "carLicense");
+    public void setCarLicense_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3309,12 +3309,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCarLicense_Cardinality(null);
     }
 
-    public void setCarLicense_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCarLicense_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCarLicense_Cardinality("carLicense", opLambda);
     }
 
-    public void setCarLicense_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "carLicense");
+    public void setCarLicense_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3324,16 +3324,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCarLicense_Missing(null);
     }
 
-    public void setCarLicense_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCarLicense_Missing("carLicense", opLambda, null);
     }
 
-    public void setCarLicense_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCarLicense_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCarLicense_Missing("carLicense", opLambda, aggsLambda);
     }
 
-    public void setCarLicense_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "carLicense");
+    public void setCarLicense_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "carLicense");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3344,22 +3345,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String mobile
-
     public void setMobile_Terms() {
         setMobile_Terms(null);
     }
 
-    public void setMobile_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setMobile_Terms("mobile", opLambda, null);
     }
 
-    public void setMobile_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMobile_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMobile_Terms("mobile", opLambda, aggsLambda);
     }
 
-    public void setMobile_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "mobile");
+    public void setMobile_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3374,17 +3373,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMobile_SignificantTerms(null);
     }
 
-    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setMobile_SignificantTerms("mobile", opLambda, null);
     }
 
-    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMobile_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setMobile_SignificantTerms("mobile", opLambda, aggsLambda);
     }
 
-    public void setMobile_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setMobile_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "mobile");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3399,16 +3399,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMobile_IpRange(null);
     }
 
-    public void setMobile_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setMobile_IpRange("mobile", opLambda, null);
     }
 
-    public void setMobile_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMobile_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMobile_IpRange("mobile", opLambda, aggsLambda);
     }
 
-    public void setMobile_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "mobile");
+    public void setMobile_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3423,12 +3423,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMobile_Count(null);
     }
 
-    public void setMobile_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setMobile_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setMobile_Count("mobile", opLambda);
     }
 
-    public void setMobile_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "mobile");
+    public void setMobile_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3438,12 +3438,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMobile_Cardinality(null);
     }
 
-    public void setMobile_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setMobile_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setMobile_Cardinality("mobile", opLambda);
     }
 
-    public void setMobile_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "mobile");
+    public void setMobile_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3453,16 +3453,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setMobile_Missing(null);
     }
 
-    public void setMobile_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setMobile_Missing("mobile", opLambda, null);
     }
 
-    public void setMobile_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setMobile_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setMobile_Missing("mobile", opLambda, aggsLambda);
     }
 
-    public void setMobile_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "mobile");
+    public void setMobile_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "mobile");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3473,22 +3473,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String postalAddress
-
     public void setPostalAddress_Terms() {
         setPostalAddress_Terms(null);
     }
 
-    public void setPostalAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPostalAddress_Terms("postalAddress", opLambda, null);
     }
 
-    public void setPostalAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalAddress_Terms("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "postalAddress");
+    public void setPostalAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3503,17 +3501,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalAddress_SignificantTerms(null);
     }
 
-    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPostalAddress_SignificantTerms("postalAddress", opLambda, null);
     }
 
-    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setPostalAddress_SignificantTerms("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPostalAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "postalAddress");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3528,16 +3527,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalAddress_IpRange(null);
     }
 
-    public void setPostalAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPostalAddress_IpRange("postalAddress", opLambda, null);
     }
 
-    public void setPostalAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalAddress_IpRange("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "postalAddress");
+    public void setPostalAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3552,12 +3552,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalAddress_Count(null);
     }
 
-    public void setPostalAddress_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPostalAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPostalAddress_Count("postalAddress", opLambda);
     }
 
-    public void setPostalAddress_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "postalAddress");
+    public void setPostalAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3567,12 +3567,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalAddress_Cardinality(null);
     }
 
-    public void setPostalAddress_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPostalAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPostalAddress_Cardinality("postalAddress", opLambda);
     }
 
-    public void setPostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "postalAddress");
+    public void setPostalAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3582,16 +3582,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPostalAddress_Missing(null);
     }
 
-    public void setPostalAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPostalAddress_Missing("postalAddress", opLambda, null);
     }
 
-    public void setPostalAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPostalAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPostalAddress_Missing("postalAddress", opLambda, aggsLambda);
     }
 
-    public void setPostalAddress_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "postalAddress");
+    public void setPostalAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "postalAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3602,22 +3603,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String city
-
     public void setCity_Terms() {
         setCity_Terms(null);
     }
 
-    public void setCity_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setCity_Terms("city", opLambda, null);
     }
 
-    public void setCity_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCity_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCity_Terms("city", opLambda, aggsLambda);
     }
 
-    public void setCity_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "city");
+    public void setCity_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3632,17 +3631,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCity_SignificantTerms(null);
     }
 
-    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setCity_SignificantTerms("city", opLambda, null);
     }
 
-    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCity_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCity_SignificantTerms("city", opLambda, aggsLambda);
     }
 
-    public void setCity_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setCity_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "city");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3657,16 +3656,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCity_IpRange(null);
     }
 
-    public void setCity_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setCity_IpRange("city", opLambda, null);
     }
 
-    public void setCity_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCity_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCity_IpRange("city", opLambda, aggsLambda);
     }
 
-    public void setCity_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "city");
+    public void setCity_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3681,12 +3680,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCity_Count(null);
     }
 
-    public void setCity_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setCity_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setCity_Count("city", opLambda);
     }
 
-    public void setCity_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "city");
+    public void setCity_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3696,12 +3695,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCity_Cardinality(null);
     }
 
-    public void setCity_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setCity_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setCity_Cardinality("city", opLambda);
     }
 
-    public void setCity_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "city");
+    public void setCity_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3711,16 +3710,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setCity_Missing(null);
     }
 
-    public void setCity_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setCity_Missing("city", opLambda, null);
     }
 
-    public void setCity_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setCity_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setCity_Missing("city", opLambda, aggsLambda);
     }
 
-    public void setCity_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "city");
+    public void setCity_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "city");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3731,23 +3730,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String teletexTerminalIdentifier
-
     public void setTeletexTerminalIdentifier_Terms() {
         setTeletexTerminalIdentifier_Terms(null);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTeletexTerminalIdentifier_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setTeletexTerminalIdentifier_Terms("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda,
+    public void setTeletexTerminalIdentifier_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "teletexTerminalIdentifier");
+        TermsAggregationBuilder builder = regTermsA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3762,18 +3759,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTeletexTerminalIdentifier_SignificantTerms(null);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setTeletexTerminalIdentifier_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setTeletexTerminalIdentifier_SignificantTerms("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
-            OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "teletexTerminalIdentifier");
+    public void setTeletexTerminalIdentifier_SignificantTerms(String name,
+            ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3788,17 +3785,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTeletexTerminalIdentifier_IpRange(null);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTeletexTerminalIdentifier_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setTeletexTerminalIdentifier_IpRange("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda,
+    public void setTeletexTerminalIdentifier_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "teletexTerminalIdentifier");
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3813,12 +3811,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTeletexTerminalIdentifier_Count(null);
     }
 
-    public void setTeletexTerminalIdentifier_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_Count("teletexTerminalIdentifier", opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "teletexTerminalIdentifier");
+    public void setTeletexTerminalIdentifier_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3828,12 +3826,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTeletexTerminalIdentifier_Cardinality(null);
     }
 
-    public void setTeletexTerminalIdentifier_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_Cardinality("teletexTerminalIdentifier", opLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "teletexTerminalIdentifier");
+    public void setTeletexTerminalIdentifier_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3843,17 +3841,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setTeletexTerminalIdentifier_Missing(null);
     }
 
-    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, null);
     }
 
-    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setTeletexTerminalIdentifier_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setTeletexTerminalIdentifier_Missing("teletexTerminalIdentifier", opLambda, aggsLambda);
     }
 
-    public void setTeletexTerminalIdentifier_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda,
+    public void setTeletexTerminalIdentifier_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "teletexTerminalIdentifier");
+        MissingAggregationBuilder builder = regMissingA(name, "teletexTerminalIdentifier");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3864,22 +3863,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String x121Address
-
     public void setX121Address_Terms() {
         setX121Address_Terms(null);
     }
 
-    public void setX121Address_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setX121Address_Terms("x121Address", opLambda, null);
     }
 
-    public void setX121Address_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setX121Address_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setX121Address_Terms("x121Address", opLambda, aggsLambda);
     }
 
-    public void setX121Address_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "x121Address");
+    public void setX121Address_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3894,17 +3891,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setX121Address_SignificantTerms(null);
     }
 
-    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setX121Address_SignificantTerms("x121Address", opLambda, null);
     }
 
-    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setX121Address_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setX121Address_SignificantTerms("x121Address", opLambda, aggsLambda);
     }
 
-    public void setX121Address_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setX121Address_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "x121Address");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3919,16 +3917,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setX121Address_IpRange(null);
     }
 
-    public void setX121Address_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setX121Address_IpRange("x121Address", opLambda, null);
     }
 
-    public void setX121Address_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setX121Address_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setX121Address_IpRange("x121Address", opLambda, aggsLambda);
     }
 
-    public void setX121Address_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "x121Address");
+    public void setX121Address_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3943,12 +3942,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setX121Address_Count(null);
     }
 
-    public void setX121Address_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setX121Address_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setX121Address_Count("x121Address", opLambda);
     }
 
-    public void setX121Address_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "x121Address");
+    public void setX121Address_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3958,12 +3957,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setX121Address_Cardinality(null);
     }
 
-    public void setX121Address_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setX121Address_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setX121Address_Cardinality("x121Address", opLambda);
     }
 
-    public void setX121Address_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "x121Address");
+    public void setX121Address_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3973,16 +3972,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setX121Address_Missing(null);
     }
 
-    public void setX121Address_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setX121Address_Missing("x121Address", opLambda, null);
     }
 
-    public void setX121Address_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setX121Address_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setX121Address_Missing("x121Address", opLambda, aggsLambda);
     }
 
-    public void setX121Address_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "x121Address");
+    public void setX121Address_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "x121Address");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3993,22 +3993,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String businessCategory
-
     public void setBusinessCategory_Terms() {
         setBusinessCategory_Terms(null);
     }
 
-    public void setBusinessCategory_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setBusinessCategory_Terms("businessCategory", opLambda, null);
     }
 
-    public void setBusinessCategory_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setBusinessCategory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setBusinessCategory_Terms("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "businessCategory");
+    public void setBusinessCategory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4023,18 +4022,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setBusinessCategory_SignificantTerms(null);
     }
 
-    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setBusinessCategory_SignificantTerms("businessCategory", opLambda, null);
     }
 
-    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setBusinessCategory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setBusinessCategory_SignificantTerms("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setBusinessCategory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "businessCategory");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4049,16 +4048,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setBusinessCategory_IpRange(null);
     }
 
-    public void setBusinessCategory_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setBusinessCategory_IpRange("businessCategory", opLambda, null);
     }
 
-    public void setBusinessCategory_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setBusinessCategory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setBusinessCategory_IpRange("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "businessCategory");
+    public void setBusinessCategory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4073,12 +4073,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setBusinessCategory_Count(null);
     }
 
-    public void setBusinessCategory_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setBusinessCategory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setBusinessCategory_Count("businessCategory", opLambda);
     }
 
-    public void setBusinessCategory_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "businessCategory");
+    public void setBusinessCategory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4088,12 +4088,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setBusinessCategory_Cardinality(null);
     }
 
-    public void setBusinessCategory_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setBusinessCategory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setBusinessCategory_Cardinality("businessCategory", opLambda);
     }
 
-    public void setBusinessCategory_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "businessCategory");
+    public void setBusinessCategory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4103,16 +4103,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setBusinessCategory_Missing(null);
     }
 
-    public void setBusinessCategory_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setBusinessCategory_Missing("businessCategory", opLambda, null);
     }
 
-    public void setBusinessCategory_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setBusinessCategory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setBusinessCategory_Missing("businessCategory", opLambda, aggsLambda);
     }
 
-    public void setBusinessCategory_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "businessCategory");
+    public void setBusinessCategory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "businessCategory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4123,22 +4124,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String registeredAddress
-
     public void setRegisteredAddress_Terms() {
         setRegisteredAddress_Terms(null);
     }
 
-    public void setRegisteredAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRegisteredAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRegisteredAddress_Terms("registeredAddress", opLambda, null);
     }
 
-    public void setRegisteredAddress_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRegisteredAddress_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRegisteredAddress_Terms("registeredAddress", opLambda, aggsLambda);
     }
 
-    public void setRegisteredAddress_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "registeredAddress");
+    public void setRegisteredAddress_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4153,18 +4153,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRegisteredAddress_SignificantTerms(null);
     }
 
-    public void setRegisteredAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRegisteredAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRegisteredAddress_SignificantTerms("registeredAddress", opLambda, null);
     }
 
-    public void setRegisteredAddress_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRegisteredAddress_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setRegisteredAddress_SignificantTerms("registeredAddress", opLambda, aggsLambda);
     }
 
-    public void setRegisteredAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRegisteredAddress_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "registeredAddress");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4179,16 +4179,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRegisteredAddress_IpRange(null);
     }
 
-    public void setRegisteredAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRegisteredAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRegisteredAddress_IpRange("registeredAddress", opLambda, null);
     }
 
-    public void setRegisteredAddress_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRegisteredAddress_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRegisteredAddress_IpRange("registeredAddress", opLambda, aggsLambda);
     }
 
-    public void setRegisteredAddress_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "registeredAddress");
+    public void setRegisteredAddress_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4203,12 +4204,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRegisteredAddress_Count(null);
     }
 
-    public void setRegisteredAddress_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRegisteredAddress_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRegisteredAddress_Count("registeredAddress", opLambda);
     }
 
-    public void setRegisteredAddress_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "registeredAddress");
+    public void setRegisteredAddress_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4218,12 +4219,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRegisteredAddress_Cardinality(null);
     }
 
-    public void setRegisteredAddress_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRegisteredAddress_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRegisteredAddress_Cardinality("registeredAddress", opLambda);
     }
 
-    public void setRegisteredAddress_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "registeredAddress");
+    public void setRegisteredAddress_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4233,16 +4234,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRegisteredAddress_Missing(null);
     }
 
-    public void setRegisteredAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRegisteredAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRegisteredAddress_Missing("registeredAddress", opLambda, null);
     }
 
-    public void setRegisteredAddress_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRegisteredAddress_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRegisteredAddress_Missing("registeredAddress", opLambda, aggsLambda);
     }
 
-    public void setRegisteredAddress_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "registeredAddress");
+    public void setRegisteredAddress_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "registeredAddress");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4253,22 +4255,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String displayName
-
     public void setDisplayName_Terms() {
         setDisplayName_Terms(null);
     }
 
-    public void setDisplayName_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDisplayName_Terms("displayName", opLambda, null);
     }
 
-    public void setDisplayName_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDisplayName_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDisplayName_Terms("displayName", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "displayName");
+    public void setDisplayName_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4283,17 +4283,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDisplayName_SignificantTerms(null);
     }
 
-    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDisplayName_SignificantTerms("displayName", opLambda, null);
     }
 
-    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDisplayName_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setDisplayName_SignificantTerms("displayName", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDisplayName_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "displayName");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4308,16 +4309,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDisplayName_IpRange(null);
     }
 
-    public void setDisplayName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDisplayName_IpRange("displayName", opLambda, null);
     }
 
-    public void setDisplayName_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDisplayName_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDisplayName_IpRange("displayName", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "displayName");
+    public void setDisplayName_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4332,12 +4334,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDisplayName_Count(null);
     }
 
-    public void setDisplayName_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDisplayName_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDisplayName_Count("displayName", opLambda);
     }
 
-    public void setDisplayName_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "displayName");
+    public void setDisplayName_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4347,12 +4349,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDisplayName_Cardinality(null);
     }
 
-    public void setDisplayName_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDisplayName_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDisplayName_Cardinality("displayName", opLambda);
     }
 
-    public void setDisplayName_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "displayName");
+    public void setDisplayName_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4362,16 +4364,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDisplayName_Missing(null);
     }
 
-    public void setDisplayName_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDisplayName_Missing("displayName", opLambda, null);
     }
 
-    public void setDisplayName_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDisplayName_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDisplayName_Missing("displayName", opLambda, aggsLambda);
     }
 
-    public void setDisplayName_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "displayName");
+    public void setDisplayName_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "displayName");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4382,22 +4385,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String preferredLanguage
-
     public void setPreferredLanguage_Terms() {
         setPreferredLanguage_Terms(null);
     }
 
-    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setPreferredLanguage_Terms("preferredLanguage", opLambda, null);
     }
 
-    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPreferredLanguage_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPreferredLanguage_Terms("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "preferredLanguage");
+    public void setPreferredLanguage_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4412,18 +4414,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPreferredLanguage_SignificantTerms(null);
     }
 
-    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, null);
     }
 
-    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPreferredLanguage_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setPreferredLanguage_SignificantTerms("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setPreferredLanguage_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "preferredLanguage");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4438,16 +4440,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPreferredLanguage_IpRange(null);
     }
 
-    public void setPreferredLanguage_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setPreferredLanguage_IpRange("preferredLanguage", opLambda, null);
     }
 
-    public void setPreferredLanguage_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPreferredLanguage_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPreferredLanguage_IpRange("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "preferredLanguage");
+    public void setPreferredLanguage_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4462,12 +4465,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPreferredLanguage_Count(null);
     }
 
-    public void setPreferredLanguage_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setPreferredLanguage_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setPreferredLanguage_Count("preferredLanguage", opLambda);
     }
 
-    public void setPreferredLanguage_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "preferredLanguage");
+    public void setPreferredLanguage_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4477,12 +4480,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPreferredLanguage_Cardinality(null);
     }
 
-    public void setPreferredLanguage_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setPreferredLanguage_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setPreferredLanguage_Cardinality("preferredLanguage", opLambda);
     }
 
-    public void setPreferredLanguage_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "preferredLanguage");
+    public void setPreferredLanguage_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4492,16 +4495,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setPreferredLanguage_Missing(null);
     }
 
-    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setPreferredLanguage_Missing("preferredLanguage", opLambda, null);
     }
 
-    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setPreferredLanguage_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setPreferredLanguage_Missing("preferredLanguage", opLambda, aggsLambda);
     }
 
-    public void setPreferredLanguage_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "preferredLanguage");
+    public void setPreferredLanguage_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "preferredLanguage");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4512,22 +4516,21 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String departmentNumber
-
     public void setDepartmentNumber_Terms() {
         setDepartmentNumber_Terms(null);
     }
 
-    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setDepartmentNumber_Terms("departmentNumber", opLambda, null);
     }
 
-    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDepartmentNumber_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDepartmentNumber_Terms("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "departmentNumber");
+    public void setDepartmentNumber_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4542,18 +4545,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDepartmentNumber_SignificantTerms(null);
     }
 
-    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, null);
     }
 
-    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDepartmentNumber_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
         setDepartmentNumber_SignificantTerms("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setDepartmentNumber_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "departmentNumber");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4568,16 +4571,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDepartmentNumber_IpRange(null);
     }
 
-    public void setDepartmentNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setDepartmentNumber_IpRange("departmentNumber", opLambda, null);
     }
 
-    public void setDepartmentNumber_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDepartmentNumber_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDepartmentNumber_IpRange("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "departmentNumber");
+    public void setDepartmentNumber_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4592,12 +4596,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDepartmentNumber_Count(null);
     }
 
-    public void setDepartmentNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setDepartmentNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setDepartmentNumber_Count("departmentNumber", opLambda);
     }
 
-    public void setDepartmentNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "departmentNumber");
+    public void setDepartmentNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4607,12 +4611,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDepartmentNumber_Cardinality(null);
     }
 
-    public void setDepartmentNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setDepartmentNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setDepartmentNumber_Cardinality("departmentNumber", opLambda);
     }
 
-    public void setDepartmentNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "departmentNumber");
+    public void setDepartmentNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4622,16 +4626,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setDepartmentNumber_Missing(null);
     }
 
-    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setDepartmentNumber_Missing("departmentNumber", opLambda, null);
     }
 
-    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setDepartmentNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setDepartmentNumber_Missing("departmentNumber", opLambda, aggsLambda);
     }
 
-    public void setDepartmentNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "departmentNumber");
+    public void setDepartmentNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "departmentNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4642,17 +4647,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long uidNumber
     public void setUidNumber_Avg() {
         setUidNumber_Avg(null);
     }
 
-    public void setUidNumber_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setUidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setUidNumber_Avg("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "uidNumber");
+    public void setUidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4662,12 +4666,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Max(null);
     }
 
-    public void setUidNumber_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setUidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setUidNumber_Max("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "uidNumber");
+    public void setUidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4677,12 +4681,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Min(null);
     }
 
-    public void setUidNumber_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setUidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setUidNumber_Min("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "uidNumber");
+    public void setUidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4692,12 +4696,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Sum(null);
     }
 
-    public void setUidNumber_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setUidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setUidNumber_Sum("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "uidNumber");
+    public void setUidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4707,12 +4711,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_ExtendedStats(null);
     }
 
-    public void setUidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setUidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setUidNumber_ExtendedStats("uidNumber", opLambda);
     }
 
-    public void setUidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "uidNumber");
+    public void setUidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4722,12 +4726,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Stats(null);
     }
 
-    public void setUidNumber_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setUidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setUidNumber_Stats("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "uidNumber");
+    public void setUidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4737,12 +4741,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Percentiles(null);
     }
 
-    public void setUidNumber_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setUidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setUidNumber_Percentiles("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "uidNumber");
+    public void setUidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4752,12 +4756,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_PercentileRanks(null);
     }
 
-    public void setUidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setUidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setUidNumber_PercentileRanks("uidNumber", opLambda);
     }
 
-    public void setUidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "uidNumber");
+    public void setUidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4767,16 +4771,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Histogram(null);
     }
 
-    public void setUidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setUidNumber_Histogram("uidNumber", opLambda, null);
     }
 
-    public void setUidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setUidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setUidNumber_Histogram("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "uidNumber");
+    public void setUidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4791,16 +4796,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Range(null);
     }
 
-    public void setUidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setUidNumber_Range("uidNumber", opLambda, null);
     }
 
-    public void setUidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setUidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setUidNumber_Range("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "uidNumber");
+    public void setUidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4815,12 +4820,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Count(null);
     }
 
-    public void setUidNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setUidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setUidNumber_Count("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "uidNumber");
+    public void setUidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4830,12 +4835,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Cardinality(null);
     }
 
-    public void setUidNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setUidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setUidNumber_Cardinality("uidNumber", opLambda);
     }
 
-    public void setUidNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "uidNumber");
+    public void setUidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4845,16 +4850,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setUidNumber_Missing(null);
     }
 
-    public void setUidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setUidNumber_Missing("uidNumber", opLambda, null);
     }
 
-    public void setUidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setUidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setUidNumber_Missing("uidNumber", opLambda, aggsLambda);
     }
 
-    public void setUidNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "uidNumber");
+    public void setUidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "uidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4865,17 +4870,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // Long gidNumber
     public void setGidNumber_Avg() {
         setGidNumber_Avg(null);
     }
 
-    public void setGidNumber_Avg(ConditionOptionCall<AvgBuilder> opLambda) {
+    public void setGidNumber_Avg(ConditionOptionCall<AvgAggregationBuilder> opLambda) {
         setGidNumber_Avg("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgBuilder> opLambda) {
-        AvgBuilder builder = regAvgA(name, "gidNumber");
+    public void setGidNumber_Avg(String name, ConditionOptionCall<AvgAggregationBuilder> opLambda) {
+        AvgAggregationBuilder builder = regAvgA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4885,12 +4889,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Max(null);
     }
 
-    public void setGidNumber_Max(ConditionOptionCall<MaxBuilder> opLambda) {
+    public void setGidNumber_Max(ConditionOptionCall<MaxAggregationBuilder> opLambda) {
         setGidNumber_Max("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Max(String name, ConditionOptionCall<MaxBuilder> opLambda) {
-        MaxBuilder builder = regMaxA(name, "gidNumber");
+    public void setGidNumber_Max(String name, ConditionOptionCall<MaxAggregationBuilder> opLambda) {
+        MaxAggregationBuilder builder = regMaxA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4900,12 +4904,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Min(null);
     }
 
-    public void setGidNumber_Min(ConditionOptionCall<MinBuilder> opLambda) {
+    public void setGidNumber_Min(ConditionOptionCall<MinAggregationBuilder> opLambda) {
         setGidNumber_Min("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Min(String name, ConditionOptionCall<MinBuilder> opLambda) {
-        MinBuilder builder = regMinA(name, "gidNumber");
+    public void setGidNumber_Min(String name, ConditionOptionCall<MinAggregationBuilder> opLambda) {
+        MinAggregationBuilder builder = regMinA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4915,12 +4919,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Sum(null);
     }
 
-    public void setGidNumber_Sum(ConditionOptionCall<SumBuilder> opLambda) {
+    public void setGidNumber_Sum(ConditionOptionCall<SumAggregationBuilder> opLambda) {
         setGidNumber_Sum("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Sum(String name, ConditionOptionCall<SumBuilder> opLambda) {
-        SumBuilder builder = regSumA(name, "gidNumber");
+    public void setGidNumber_Sum(String name, ConditionOptionCall<SumAggregationBuilder> opLambda) {
+        SumAggregationBuilder builder = regSumA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4930,12 +4934,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_ExtendedStats(null);
     }
 
-    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
+    public void setGidNumber_ExtendedStats(ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
         setGidNumber_ExtendedStats("gidNumber", opLambda);
     }
 
-    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsBuilder> opLambda) {
-        ExtendedStatsBuilder builder = regExtendedStatsA(name, "gidNumber");
+    public void setGidNumber_ExtendedStats(String name, ConditionOptionCall<ExtendedStatsAggregationBuilder> opLambda) {
+        ExtendedStatsAggregationBuilder builder = regExtendedStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4945,12 +4949,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Stats(null);
     }
 
-    public void setGidNumber_Stats(ConditionOptionCall<StatsBuilder> opLambda) {
+    public void setGidNumber_Stats(ConditionOptionCall<StatsAggregationBuilder> opLambda) {
         setGidNumber_Stats("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsBuilder> opLambda) {
-        StatsBuilder builder = regStatsA(name, "gidNumber");
+    public void setGidNumber_Stats(String name, ConditionOptionCall<StatsAggregationBuilder> opLambda) {
+        StatsAggregationBuilder builder = regStatsA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4960,12 +4964,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Percentiles(null);
     }
 
-    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesBuilder> opLambda) {
+    public void setGidNumber_Percentiles(ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
         setGidNumber_Percentiles("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesBuilder> opLambda) {
-        PercentilesBuilder builder = regPercentilesA(name, "gidNumber");
+    public void setGidNumber_Percentiles(String name, ConditionOptionCall<PercentilesAggregationBuilder> opLambda) {
+        PercentilesAggregationBuilder builder = regPercentilesA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4975,12 +4979,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_PercentileRanks(null);
     }
 
-    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksBuilder> opLambda) {
+    public void setGidNumber_PercentileRanks(ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
         setGidNumber_PercentileRanks("gidNumber", opLambda);
     }
 
-    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksBuilder> opLambda) {
-        PercentileRanksBuilder builder = regPercentileRanksA(name, "gidNumber");
+    public void setGidNumber_PercentileRanks(String name, ConditionOptionCall<PercentileRanksAggregationBuilder> opLambda) {
+        PercentileRanksAggregationBuilder builder = regPercentileRanksA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4990,16 +4994,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Histogram(null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda) {
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda) {
         setGidNumber_Histogram("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Histogram(ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGidNumber_Histogram(ConditionOptionCall<HistogramAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGidNumber_Histogram("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        HistogramBuilder builder = regHistogramA(name, "gidNumber");
+    public void setGidNumber_Histogram(String name, ConditionOptionCall<HistogramAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        HistogramAggregationBuilder builder = regHistogramA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5014,16 +5019,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Range(null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda) {
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda) {
         setGidNumber_Range("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Range(ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGidNumber_Range(ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGidNumber_Range("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Range(String name, ConditionOptionCall<RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        RangeBuilder builder = regRangeA(name, "gidNumber");
+    public void setGidNumber_Range(String name, ConditionOptionCall<RangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        RangeAggregationBuilder builder = regRangeA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5038,12 +5043,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Count(null);
     }
 
-    public void setGidNumber_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGidNumber_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGidNumber_Count("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "gidNumber");
+    public void setGidNumber_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5053,12 +5058,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Cardinality(null);
     }
 
-    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGidNumber_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGidNumber_Cardinality("gidNumber", opLambda);
     }
 
-    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "gidNumber");
+    public void setGidNumber_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5068,16 +5073,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGidNumber_Missing(null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGidNumber_Missing("gidNumber", opLambda, null);
     }
 
-    public void setGidNumber_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGidNumber_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGidNumber_Missing("gidNumber", opLambda, aggsLambda);
     }
 
-    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "gidNumber");
+    public void setGidNumber_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "gidNumber");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5088,22 +5093,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String homeDirectory
-
     public void setHomeDirectory_Terms() {
         setHomeDirectory_Terms(null);
     }
 
-    public void setHomeDirectory_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setHomeDirectory_Terms("homeDirectory", opLambda, null);
     }
 
-    public void setHomeDirectory_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomeDirectory_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomeDirectory_Terms("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "homeDirectory");
+    public void setHomeDirectory_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5118,17 +5121,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomeDirectory_SignificantTerms(null);
     }
 
-    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setHomeDirectory_SignificantTerms("homeDirectory", opLambda, null);
     }
 
-    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomeDirectory_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setHomeDirectory_SignificantTerms("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setHomeDirectory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setHomeDirectory_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "homeDirectory");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5143,16 +5147,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomeDirectory_IpRange(null);
     }
 
-    public void setHomeDirectory_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setHomeDirectory_IpRange("homeDirectory", opLambda, null);
     }
 
-    public void setHomeDirectory_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomeDirectory_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomeDirectory_IpRange("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setHomeDirectory_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "homeDirectory");
+    public void setHomeDirectory_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5167,12 +5172,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomeDirectory_Count(null);
     }
 
-    public void setHomeDirectory_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setHomeDirectory_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setHomeDirectory_Count("homeDirectory", opLambda);
     }
 
-    public void setHomeDirectory_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "homeDirectory");
+    public void setHomeDirectory_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5182,12 +5187,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomeDirectory_Cardinality(null);
     }
 
-    public void setHomeDirectory_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setHomeDirectory_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setHomeDirectory_Cardinality("homeDirectory", opLambda);
     }
 
-    public void setHomeDirectory_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "homeDirectory");
+    public void setHomeDirectory_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5197,16 +5202,17 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setHomeDirectory_Missing(null);
     }
 
-    public void setHomeDirectory_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setHomeDirectory_Missing("homeDirectory", opLambda, null);
     }
 
-    public void setHomeDirectory_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setHomeDirectory_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setHomeDirectory_Missing("homeDirectory", opLambda, aggsLambda);
     }
 
-    public void setHomeDirectory_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "homeDirectory");
+    public void setHomeDirectory_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "homeDirectory");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5217,22 +5223,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String groups
-
     public void setGroups_Terms() {
         setGroups_Terms(null);
     }
 
-    public void setGroups_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setGroups_Terms("groups", opLambda, null);
     }
 
-    public void setGroups_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGroups_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGroups_Terms("groups", opLambda, aggsLambda);
     }
 
-    public void setGroups_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "groups");
+    public void setGroups_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5247,17 +5251,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGroups_SignificantTerms(null);
     }
 
-    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setGroups_SignificantTerms("groups", opLambda, null);
     }
 
-    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGroups_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setGroups_SignificantTerms("groups", opLambda, aggsLambda);
     }
 
-    public void setGroups_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setGroups_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "groups");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5272,16 +5277,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGroups_IpRange(null);
     }
 
-    public void setGroups_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setGroups_IpRange("groups", opLambda, null);
     }
 
-    public void setGroups_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGroups_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGroups_IpRange("groups", opLambda, aggsLambda);
     }
 
-    public void setGroups_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "groups");
+    public void setGroups_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5296,12 +5301,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGroups_Count(null);
     }
 
-    public void setGroups_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setGroups_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setGroups_Count("groups", opLambda);
     }
 
-    public void setGroups_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "groups");
+    public void setGroups_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5311,12 +5316,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGroups_Cardinality(null);
     }
 
-    public void setGroups_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setGroups_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setGroups_Cardinality("groups", opLambda);
     }
 
-    public void setGroups_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "groups");
+    public void setGroups_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5326,16 +5331,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setGroups_Missing(null);
     }
 
-    public void setGroups_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setGroups_Missing("groups", opLambda, null);
     }
 
-    public void setGroups_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setGroups_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setGroups_Missing("groups", opLambda, aggsLambda);
     }
 
-    public void setGroups_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "groups");
+    public void setGroups_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "groups");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5346,22 +5351,20 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         }
     }
 
-    // String roles
-
     public void setRoles_Terms() {
         setRoles_Terms(null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsBuilder> opLambda) {
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda) {
         setRoles_Terms("roles", opLambda, null);
     }
 
-    public void setRoles_Terms(ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoles_Terms(ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoles_Terms("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_Terms(String name, ConditionOptionCall<TermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        TermsBuilder builder = regTermsA(name, "roles");
+    public void setRoles_Terms(String name, ConditionOptionCall<TermsAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        TermsAggregationBuilder builder = regTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5376,17 +5379,18 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoles_SignificantTerms(null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda) {
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda) {
         setRoles_SignificantTerms("roles", opLambda, null);
     }
 
-    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoles_SignificantTerms(ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
+            OperatorCall<BsUserCA> aggsLambda) {
         setRoles_SignificantTerms("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsBuilder> opLambda,
+    public void setRoles_SignificantTerms(String name, ConditionOptionCall<SignificantTermsAggregationBuilder> opLambda,
             OperatorCall<BsUserCA> aggsLambda) {
-        SignificantTermsBuilder builder = regSignificantTermsA(name, "roles");
+        SignificantTermsAggregationBuilder builder = regSignificantTermsA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5401,16 +5405,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoles_IpRange(null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda) {
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda) {
         setRoles_IpRange("roles", opLambda, null);
     }
 
-    public void setRoles_IpRange(ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoles_IpRange(ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoles_IpRange("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_IpRange(String name, ConditionOptionCall<IPv4RangeBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        IPv4RangeBuilder builder = regIpRangeA(name, "roles");
+    public void setRoles_IpRange(String name, ConditionOptionCall<IpRangeAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        IpRangeAggregationBuilder builder = regIpRangeA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5425,12 +5429,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoles_Count(null);
     }
 
-    public void setRoles_Count(ConditionOptionCall<ValueCountBuilder> opLambda) {
+    public void setRoles_Count(ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
         setRoles_Count("roles", opLambda);
     }
 
-    public void setRoles_Count(String name, ConditionOptionCall<ValueCountBuilder> opLambda) {
-        ValueCountBuilder builder = regCountA(name, "roles");
+    public void setRoles_Count(String name, ConditionOptionCall<ValueCountAggregationBuilder> opLambda) {
+        ValueCountAggregationBuilder builder = regCountA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5440,12 +5444,12 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoles_Cardinality(null);
     }
 
-    public void setRoles_Cardinality(ConditionOptionCall<CardinalityBuilder> opLambda) {
+    public void setRoles_Cardinality(ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
         setRoles_Cardinality("roles", opLambda);
     }
 
-    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityBuilder> opLambda) {
-        CardinalityBuilder builder = regCardinalityA(name, "roles");
+    public void setRoles_Cardinality(String name, ConditionOptionCall<CardinalityAggregationBuilder> opLambda) {
+        CardinalityAggregationBuilder builder = regCardinalityA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5455,16 +5459,16 @@ public abstract class BsUserCA extends EsAbstractConditionAggregation {
         setRoles_Missing(null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingBuilder> opLambda) {
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda) {
         setRoles_Missing("roles", opLambda, null);
     }
 
-    public void setRoles_Missing(ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+    public void setRoles_Missing(ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
         setRoles_Missing("roles", opLambda, aggsLambda);
     }
 
-    public void setRoles_Missing(String name, ConditionOptionCall<MissingBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
-        MissingBuilder builder = regMissingA(name, "roles");
+    public void setRoles_Missing(String name, ConditionOptionCall<MissingAggregationBuilder> opLambda, OperatorCall<BsUserCA> aggsLambda) {
+        MissingAggregationBuilder builder = regMissingA(name, "roles");
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
index aadf427dc4b23ddf55339437ae898e4ec6380633..98e9117b494db273dd3efbf9a787e6bac9c614fc 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsGroupCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         GroupCQ cq = new GroupCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 GroupCQ cf = new GroupCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setGidNumber_MatchPhrase(gidNumber, null);
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
+    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setGidNumber_MatchPhrasePrefix(gidNumber, null);
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
         setGidNumber_Fuzzy(gidNumber, null);
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
+    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -490,7 +510,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -501,7 +522,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -512,7 +534,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -523,7 +546,8 @@ public abstract class BsGroupCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
index 5e24e82149cf85bd99a5ce57e18237482cae01ff..a1dc756489846616dc883d4785806de545cf253c 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsRoleCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         RoleCQ cq = new RoleCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 RoleCQ cf = new RoleCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsRoleCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
index a2883b1957ca859de9fecf09160d04fe86e69fbd..748b58bd5432e1b15d5c1e187a8a971738fff190 100644
--- a/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
+++ b/src/main/java/org/codelibs/fess/es/user/cbean/cq/bs/BsUserCQ.java
@@ -16,6 +16,7 @@
 package org.codelibs.fess.es.user.cbean.cq.bs;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Collection;
 
 import org.codelibs.fess.es.user.allcommon.EsAbstractConditionQuery;
@@ -24,16 +25,19 @@ import org.dbflute.cbean.ckey.ConditionKey;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.CommonTermsQueryBuilder;
 import org.elasticsearch.index.query.ExistsQueryBuilder;
-import org.elasticsearch.index.query.FuzzyQueryBuilder;
 import org.elasticsearch.index.query.IdsQueryBuilder;
+import org.elasticsearch.index.query.MatchPhrasePrefixQueryBuilder;
+import org.elasticsearch.index.query.MatchPhraseQueryBuilder;
 import org.elasticsearch.index.query.MatchQueryBuilder;
 import org.elasticsearch.index.query.PrefixQueryBuilder;
 import org.elasticsearch.index.query.RangeQueryBuilder;
 import org.elasticsearch.index.query.RegexpQueryBuilder;
+import org.elasticsearch.index.query.SpanTermQueryBuilder;
 import org.elasticsearch.index.query.TermQueryBuilder;
 import org.elasticsearch.index.query.TermsQueryBuilder;
 import org.elasticsearch.index.query.WildcardQueryBuilder;
 import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 
 /**
  * @author ESFlute (using FreeGen)
@@ -62,14 +66,15 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
             final ConditionOptionCall<FunctionScoreQueryBuilder> opLambda) {
         UserCQ cq = new UserCQ();
         queryLambda.callback(cq);
-        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery());
+        final Collection<FilterFunctionBuilder> list = new ArrayList<>();
         if (functionsLambda != null) {
             functionsLambda.callback((cqLambda, scoreFunctionBuilder) -> {
                 UserCQ cf = new UserCQ();
                 cqLambda.callback(cf);
-                builder.add(cf.getQuery(), scoreFunctionBuilder);
+                list.add(new FilterFunctionBuilder(cf.getQuery(), scoreFunctionBuilder));
             });
         }
+        final FunctionScoreQueryBuilder builder = regFunctionScoreQ(cq.getQuery(), list);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -249,8 +254,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setName_MatchPhrase(name, null);
     }
 
-    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("name", name);
+    public void setName_MatchPhrase(String name, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -260,8 +265,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setName_MatchPhrasePrefix(name, null);
     }
 
-    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
+    public void setName_MatchPhrasePrefix(String name, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -271,8 +276,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setName_Fuzzy(name, null);
     }
 
-    public void setName_Fuzzy(String name, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("name", name);
+    public void setName_Fuzzy(String name, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("name", name);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -311,12 +316,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setName_SpanTerm(String name) {
+        setName_SpanTerm("name", null);
+    }
+
+    public void setName_SpanTerm(String name, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("name", name);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setName_GreaterThan(String name) {
         setName_GreaterThan(name, null);
     }
 
     public void setName_GreaterThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -327,7 +344,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessThan(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -338,7 +356,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_GreaterEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -349,7 +368,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setName_LessEqual(String name, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, name);
+        final Object _value = name;
+        RangeQueryBuilder builder = regRangeQ("name", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -456,8 +476,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrase(password, null);
     }
 
-    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("password", password);
+    public void setPassword_MatchPhrase(String password, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -467,8 +487,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPassword_MatchPhrasePrefix(password, null);
     }
 
-    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
+    public void setPassword_MatchPhrasePrefix(String password, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -478,8 +498,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPassword_Fuzzy(password, null);
     }
 
-    public void setPassword_Fuzzy(String password, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("password", password);
+    public void setPassword_Fuzzy(String password, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("password", password);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -518,12 +538,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPassword_SpanTerm(String password) {
+        setPassword_SpanTerm("password", null);
+    }
+
+    public void setPassword_SpanTerm(String password, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("password", password);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPassword_GreaterThan(String password) {
         setPassword_GreaterThan(password, null);
     }
 
     public void setPassword_GreaterThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -534,7 +566,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessThan(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -545,7 +578,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_GreaterEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -556,7 +590,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPassword_LessEqual(String password, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, password);
+        final Object _value = password;
+        RangeQueryBuilder builder = regRangeQ("password", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -663,8 +698,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setSurname_MatchPhrase(surname, null);
     }
 
-    public void setSurname_MatchPhrase(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("surname", surname);
+    public void setSurname_MatchPhrase(String surname, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -674,8 +709,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setSurname_MatchPhrasePrefix(surname, null);
     }
 
-    public void setSurname_MatchPhrasePrefix(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("surname", surname);
+    public void setSurname_MatchPhrasePrefix(String surname, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -685,8 +720,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setSurname_Fuzzy(surname, null);
     }
 
-    public void setSurname_Fuzzy(String surname, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("surname", surname);
+    public void setSurname_Fuzzy(String surname, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("surname", surname);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -725,12 +760,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setSurname_SpanTerm(String surname) {
+        setSurname_SpanTerm("surname", null);
+    }
+
+    public void setSurname_SpanTerm(String surname, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("surname", surname);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setSurname_GreaterThan(String surname) {
         setSurname_GreaterThan(surname, null);
     }
 
     public void setSurname_GreaterThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_THAN, surname);
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -741,7 +788,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setSurname_LessThan(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_THAN, surname);
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -752,7 +800,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setSurname_GreaterEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_EQUAL, surname);
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -763,7 +812,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setSurname_LessEqual(String surname, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_EQUAL, surname);
+        final Object _value = surname;
+        RangeQueryBuilder builder = regRangeQ("surname", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -870,8 +920,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGivenName_MatchPhrase(givenName, null);
     }
 
-    public void setGivenName_MatchPhrase(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("givenName", givenName);
+    public void setGivenName_MatchPhrase(String givenName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -881,8 +931,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGivenName_MatchPhrasePrefix(givenName, null);
     }
 
-    public void setGivenName_MatchPhrasePrefix(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("givenName", givenName);
+    public void setGivenName_MatchPhrasePrefix(String givenName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -892,8 +942,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGivenName_Fuzzy(givenName, null);
     }
 
-    public void setGivenName_Fuzzy(String givenName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("givenName", givenName);
+    public void setGivenName_Fuzzy(String givenName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("givenName", givenName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -932,12 +982,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setGivenName_SpanTerm(String givenName) {
+        setGivenName_SpanTerm("givenName", null);
+    }
+
+    public void setGivenName_SpanTerm(String givenName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("givenName", givenName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setGivenName_GreaterThan(String givenName) {
         setGivenName_GreaterThan(givenName, null);
     }
 
     public void setGivenName_GreaterThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_THAN, givenName);
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -948,7 +1010,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGivenName_LessThan(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_THAN, givenName);
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -959,7 +1022,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGivenName_GreaterEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_EQUAL, givenName);
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -970,7 +1034,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGivenName_LessEqual(String givenName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_EQUAL, givenName);
+        final Object _value = givenName;
+        RangeQueryBuilder builder = regRangeQ("givenName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1077,8 +1142,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeNumber_MatchPhrase(employeeNumber, null);
     }
 
-    public void setEmployeeNumber_MatchPhrase(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("employeeNumber", employeeNumber);
+    public void setEmployeeNumber_MatchPhrase(String employeeNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1088,8 +1153,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeNumber_MatchPhrasePrefix(employeeNumber, null);
     }
 
-    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("employeeNumber", employeeNumber);
+    public void setEmployeeNumber_MatchPhrasePrefix(String employeeNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1099,8 +1164,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeNumber_Fuzzy(employeeNumber, null);
     }
 
-    public void setEmployeeNumber_Fuzzy(String employeeNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("employeeNumber", employeeNumber);
+    public void setEmployeeNumber_Fuzzy(String employeeNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("employeeNumber", employeeNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1139,12 +1204,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setEmployeeNumber_SpanTerm(String employeeNumber) {
+        setEmployeeNumber_SpanTerm("employeeNumber", null);
+    }
+
+    public void setEmployeeNumber_SpanTerm(String employeeNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("employeeNumber", employeeNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setEmployeeNumber_GreaterThan(String employeeNumber) {
         setEmployeeNumber_GreaterThan(employeeNumber, null);
     }
 
     public void setEmployeeNumber_GreaterThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_THAN, employeeNumber);
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1155,7 +1232,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeNumber_LessThan(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_THAN, employeeNumber);
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1166,7 +1244,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeNumber_GreaterEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_EQUAL, employeeNumber);
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1177,7 +1256,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeNumber_LessEqual(String employeeNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_EQUAL, employeeNumber);
+        final Object _value = employeeNumber;
+        RangeQueryBuilder builder = regRangeQ("employeeNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1284,8 +1364,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMail_MatchPhrase(mail, null);
     }
 
-    public void setMail_MatchPhrase(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("mail", mail);
+    public void setMail_MatchPhrase(String mail, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1295,8 +1375,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMail_MatchPhrasePrefix(mail, null);
     }
 
-    public void setMail_MatchPhrasePrefix(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("mail", mail);
+    public void setMail_MatchPhrasePrefix(String mail, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1306,8 +1386,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMail_Fuzzy(mail, null);
     }
 
-    public void setMail_Fuzzy(String mail, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("mail", mail);
+    public void setMail_Fuzzy(String mail, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("mail", mail);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1346,12 +1426,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setMail_SpanTerm(String mail) {
+        setMail_SpanTerm("mail", null);
+    }
+
+    public void setMail_SpanTerm(String mail, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("mail", mail);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setMail_GreaterThan(String mail) {
         setMail_GreaterThan(mail, null);
     }
 
     public void setMail_GreaterThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_THAN, mail);
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1362,7 +1454,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMail_LessThan(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_THAN, mail);
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1373,7 +1466,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMail_GreaterEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_EQUAL, mail);
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1384,7 +1478,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMail_LessEqual(String mail, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_EQUAL, mail);
+        final Object _value = mail;
+        RangeQueryBuilder builder = regRangeQ("mail", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1491,8 +1586,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTelephoneNumber_MatchPhrase(telephoneNumber, null);
     }
 
-    public void setTelephoneNumber_MatchPhrase(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("telephoneNumber", telephoneNumber);
+    public void setTelephoneNumber_MatchPhrase(String telephoneNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1502,8 +1597,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTelephoneNumber_MatchPhrasePrefix(telephoneNumber, null);
     }
 
-    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("telephoneNumber", telephoneNumber);
+    public void setTelephoneNumber_MatchPhrasePrefix(String telephoneNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1513,8 +1608,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTelephoneNumber_Fuzzy(telephoneNumber, null);
     }
 
-    public void setTelephoneNumber_Fuzzy(String telephoneNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("telephoneNumber", telephoneNumber);
+    public void setTelephoneNumber_Fuzzy(String telephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("telephoneNumber", telephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1553,12 +1648,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTelephoneNumber_SpanTerm(String telephoneNumber) {
+        setTelephoneNumber_SpanTerm("telephoneNumber", null);
+    }
+
+    public void setTelephoneNumber_SpanTerm(String telephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("telephoneNumber", telephoneNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTelephoneNumber_GreaterThan(String telephoneNumber) {
         setTelephoneNumber_GreaterThan(telephoneNumber, null);
     }
 
     public void setTelephoneNumber_GreaterThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_THAN, telephoneNumber);
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1569,7 +1676,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTelephoneNumber_LessThan(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_THAN, telephoneNumber);
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1580,7 +1688,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTelephoneNumber_GreaterEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_EQUAL, telephoneNumber);
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1591,7 +1700,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTelephoneNumber_LessEqual(String telephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_EQUAL, telephoneNumber);
+        final Object _value = telephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("telephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1698,8 +1808,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePhone_MatchPhrase(homePhone, null);
     }
 
-    public void setHomePhone_MatchPhrase(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("homePhone", homePhone);
+    public void setHomePhone_MatchPhrase(String homePhone, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1709,8 +1819,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePhone_MatchPhrasePrefix(homePhone, null);
     }
 
-    public void setHomePhone_MatchPhrasePrefix(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("homePhone", homePhone);
+    public void setHomePhone_MatchPhrasePrefix(String homePhone, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1720,8 +1830,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePhone_Fuzzy(homePhone, null);
     }
 
-    public void setHomePhone_Fuzzy(String homePhone, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("homePhone", homePhone);
+    public void setHomePhone_Fuzzy(String homePhone, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homePhone", homePhone);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1760,12 +1870,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHomePhone_SpanTerm(String homePhone) {
+        setHomePhone_SpanTerm("homePhone", null);
+    }
+
+    public void setHomePhone_SpanTerm(String homePhone, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homePhone", homePhone);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHomePhone_GreaterThan(String homePhone) {
         setHomePhone_GreaterThan(homePhone, null);
     }
 
     public void setHomePhone_GreaterThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_THAN, homePhone);
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1776,7 +1898,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePhone_LessThan(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_THAN, homePhone);
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1787,7 +1910,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePhone_GreaterEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_EQUAL, homePhone);
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1798,7 +1922,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePhone_LessEqual(String homePhone, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_EQUAL, homePhone);
+        final Object _value = homePhone;
+        RangeQueryBuilder builder = regRangeQ("homePhone", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1905,8 +2030,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePostalAddress_MatchPhrase(homePostalAddress, null);
     }
 
-    public void setHomePostalAddress_MatchPhrase(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("homePostalAddress", homePostalAddress);
+    public void setHomePostalAddress_MatchPhrase(String homePostalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1916,8 +2041,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePostalAddress_MatchPhrasePrefix(homePostalAddress, null);
     }
 
-    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("homePostalAddress", homePostalAddress);
+    public void setHomePostalAddress_MatchPhrasePrefix(String homePostalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1927,8 +2052,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomePostalAddress_Fuzzy(homePostalAddress, null);
     }
 
-    public void setHomePostalAddress_Fuzzy(String homePostalAddress, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("homePostalAddress", homePostalAddress);
+    public void setHomePostalAddress_Fuzzy(String homePostalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homePostalAddress", homePostalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1967,12 +2092,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHomePostalAddress_SpanTerm(String homePostalAddress) {
+        setHomePostalAddress_SpanTerm("homePostalAddress", null);
+    }
+
+    public void setHomePostalAddress_SpanTerm(String homePostalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homePostalAddress", homePostalAddress);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHomePostalAddress_GreaterThan(String homePostalAddress) {
         setHomePostalAddress_GreaterThan(homePostalAddress, null);
     }
 
     public void setHomePostalAddress_GreaterThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_THAN, homePostalAddress);
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1983,7 +2120,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePostalAddress_LessThan(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_THAN, homePostalAddress);
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -1994,7 +2132,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePostalAddress_GreaterEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_EQUAL, homePostalAddress);
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2005,7 +2144,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomePostalAddress_LessEqual(String homePostalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_EQUAL, homePostalAddress);
+        final Object _value = homePostalAddress;
+        RangeQueryBuilder builder = regRangeQ("homePostalAddress", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2112,8 +2252,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setLabeledURI_MatchPhrase(labeledURI, null);
     }
 
-    public void setLabeledURI_MatchPhrase(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("labeledURI", labeledURI);
+    public void setLabeledURI_MatchPhrase(String labeledURI, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2123,8 +2263,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setLabeledURI_MatchPhrasePrefix(labeledURI, null);
     }
 
-    public void setLabeledURI_MatchPhrasePrefix(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("labeledURI", labeledURI);
+    public void setLabeledURI_MatchPhrasePrefix(String labeledURI, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2134,8 +2274,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setLabeledURI_Fuzzy(labeledURI, null);
     }
 
-    public void setLabeledURI_Fuzzy(String labeledURI, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("labeledURI", labeledURI);
+    public void setLabeledURI_Fuzzy(String labeledURI, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("labeledURI", labeledURI);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2174,12 +2314,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setLabeledURI_SpanTerm(String labeledURI) {
+        setLabeledURI_SpanTerm("labeledURI", null);
+    }
+
+    public void setLabeledURI_SpanTerm(String labeledURI, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("labeledURI", labeledURI);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setLabeledURI_GreaterThan(String labeledURI) {
         setLabeledURI_GreaterThan(labeledURI, null);
     }
 
     public void setLabeledURI_GreaterThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_THAN, labeledURI);
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2190,7 +2342,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabeledURI_LessThan(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_THAN, labeledURI);
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2201,7 +2354,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabeledURI_GreaterEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_EQUAL, labeledURI);
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2212,7 +2366,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setLabeledURI_LessEqual(String labeledURI, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_EQUAL, labeledURI);
+        final Object _value = labeledURI;
+        RangeQueryBuilder builder = regRangeQ("labeledURI", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2319,8 +2474,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoomNumber_MatchPhrase(roomNumber, null);
     }
 
-    public void setRoomNumber_MatchPhrase(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roomNumber", roomNumber);
+    public void setRoomNumber_MatchPhrase(String roomNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2330,8 +2485,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoomNumber_MatchPhrasePrefix(roomNumber, null);
     }
 
-    public void setRoomNumber_MatchPhrasePrefix(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roomNumber", roomNumber);
+    public void setRoomNumber_MatchPhrasePrefix(String roomNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2341,8 +2496,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoomNumber_Fuzzy(roomNumber, null);
     }
 
-    public void setRoomNumber_Fuzzy(String roomNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roomNumber", roomNumber);
+    public void setRoomNumber_Fuzzy(String roomNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roomNumber", roomNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2381,12 +2536,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoomNumber_SpanTerm(String roomNumber) {
+        setRoomNumber_SpanTerm("roomNumber", null);
+    }
+
+    public void setRoomNumber_SpanTerm(String roomNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roomNumber", roomNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoomNumber_GreaterThan(String roomNumber) {
         setRoomNumber_GreaterThan(roomNumber, null);
     }
 
     public void setRoomNumber_GreaterThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_THAN, roomNumber);
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2397,7 +2564,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoomNumber_LessThan(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_THAN, roomNumber);
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2408,7 +2576,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoomNumber_GreaterEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_EQUAL, roomNumber);
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2419,7 +2588,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoomNumber_LessEqual(String roomNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_EQUAL, roomNumber);
+        final Object _value = roomNumber;
+        RangeQueryBuilder builder = regRangeQ("roomNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2526,8 +2696,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDescription_MatchPhrase(description, null);
     }
 
-    public void setDescription_MatchPhrase(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("description", description);
+    public void setDescription_MatchPhrase(String description, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2537,8 +2707,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDescription_MatchPhrasePrefix(description, null);
     }
 
-    public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("description", description);
+    public void setDescription_MatchPhrasePrefix(String description, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2548,8 +2718,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDescription_Fuzzy(description, null);
     }
 
-    public void setDescription_Fuzzy(String description, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("description", description);
+    public void setDescription_Fuzzy(String description, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("description", description);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2588,12 +2758,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDescription_SpanTerm(String description) {
+        setDescription_SpanTerm("description", null);
+    }
+
+    public void setDescription_SpanTerm(String description, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("description", description);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDescription_GreaterThan(String description) {
         setDescription_GreaterThan(description, null);
     }
 
     public void setDescription_GreaterThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, description);
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2604,7 +2786,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDescription_LessThan(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, description);
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2615,7 +2798,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDescription_GreaterEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, description);
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2626,7 +2810,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDescription_LessEqual(String description, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, description);
+        final Object _value = description;
+        RangeQueryBuilder builder = regRangeQ("description", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2733,8 +2918,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTitle_MatchPhrase(title, null);
     }
 
-    public void setTitle_MatchPhrase(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("title", title);
+    public void setTitle_MatchPhrase(String title, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2744,8 +2929,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTitle_MatchPhrasePrefix(title, null);
     }
 
-    public void setTitle_MatchPhrasePrefix(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("title", title);
+    public void setTitle_MatchPhrasePrefix(String title, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2755,8 +2940,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTitle_Fuzzy(title, null);
     }
 
-    public void setTitle_Fuzzy(String title, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("title", title);
+    public void setTitle_Fuzzy(String title, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("title", title);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2795,12 +2980,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTitle_SpanTerm(String title) {
+        setTitle_SpanTerm("title", null);
+    }
+
+    public void setTitle_SpanTerm(String title, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("title", title);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTitle_GreaterThan(String title) {
         setTitle_GreaterThan(title, null);
     }
 
     public void setTitle_GreaterThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_THAN, title);
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2811,7 +3008,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTitle_LessThan(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_THAN, title);
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2822,7 +3020,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTitle_GreaterEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_EQUAL, title);
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2833,7 +3032,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTitle_LessEqual(String title, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_EQUAL, title);
+        final Object _value = title;
+        RangeQueryBuilder builder = regRangeQ("title", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2940,8 +3140,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPager_MatchPhrase(pager, null);
     }
 
-    public void setPager_MatchPhrase(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("pager", pager);
+    public void setPager_MatchPhrase(String pager, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2951,8 +3151,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPager_MatchPhrasePrefix(pager, null);
     }
 
-    public void setPager_MatchPhrasePrefix(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("pager", pager);
+    public void setPager_MatchPhrasePrefix(String pager, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -2962,8 +3162,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPager_Fuzzy(pager, null);
     }
 
-    public void setPager_Fuzzy(String pager, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("pager", pager);
+    public void setPager_Fuzzy(String pager, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("pager", pager);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3002,12 +3202,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPager_SpanTerm(String pager) {
+        setPager_SpanTerm("pager", null);
+    }
+
+    public void setPager_SpanTerm(String pager, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("pager", pager);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPager_GreaterThan(String pager) {
         setPager_GreaterThan(pager, null);
     }
 
     public void setPager_GreaterThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_THAN, pager);
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3018,7 +3230,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPager_LessThan(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_THAN, pager);
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3029,7 +3242,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPager_GreaterEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_EQUAL, pager);
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3040,7 +3254,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPager_LessEqual(String pager, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_EQUAL, pager);
+        final Object _value = pager;
+        RangeQueryBuilder builder = regRangeQ("pager", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3147,8 +3362,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setStreet_MatchPhrase(street, null);
     }
 
-    public void setStreet_MatchPhrase(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("street", street);
+    public void setStreet_MatchPhrase(String street, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3158,8 +3373,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setStreet_MatchPhrasePrefix(street, null);
     }
 
-    public void setStreet_MatchPhrasePrefix(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("street", street);
+    public void setStreet_MatchPhrasePrefix(String street, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3169,8 +3384,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setStreet_Fuzzy(street, null);
     }
 
-    public void setStreet_Fuzzy(String street, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("street", street);
+    public void setStreet_Fuzzy(String street, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("street", street);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3209,12 +3424,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setStreet_SpanTerm(String street) {
+        setStreet_SpanTerm("street", null);
+    }
+
+    public void setStreet_SpanTerm(String street, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("street", street);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setStreet_GreaterThan(String street) {
         setStreet_GreaterThan(street, null);
     }
 
     public void setStreet_GreaterThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_THAN, street);
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3225,7 +3452,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setStreet_LessThan(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_THAN, street);
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3236,7 +3464,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setStreet_GreaterEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_EQUAL, street);
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3247,7 +3476,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setStreet_LessEqual(String street, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_EQUAL, street);
+        final Object _value = street;
+        RangeQueryBuilder builder = regRangeQ("street", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3354,8 +3584,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalCode_MatchPhrase(postalCode, null);
     }
 
-    public void setPostalCode_MatchPhrase(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("postalCode", postalCode);
+    public void setPostalCode_MatchPhrase(String postalCode, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3365,8 +3595,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalCode_MatchPhrasePrefix(postalCode, null);
     }
 
-    public void setPostalCode_MatchPhrasePrefix(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("postalCode", postalCode);
+    public void setPostalCode_MatchPhrasePrefix(String postalCode, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3376,8 +3606,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalCode_Fuzzy(postalCode, null);
     }
 
-    public void setPostalCode_Fuzzy(String postalCode, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("postalCode", postalCode);
+    public void setPostalCode_Fuzzy(String postalCode, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postalCode", postalCode);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3416,12 +3646,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPostalCode_SpanTerm(String postalCode) {
+        setPostalCode_SpanTerm("postalCode", null);
+    }
+
+    public void setPostalCode_SpanTerm(String postalCode, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postalCode", postalCode);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPostalCode_GreaterThan(String postalCode) {
         setPostalCode_GreaterThan(postalCode, null);
     }
 
     public void setPostalCode_GreaterThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_THAN, postalCode);
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3432,7 +3674,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalCode_LessThan(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_THAN, postalCode);
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3443,7 +3686,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalCode_GreaterEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_EQUAL, postalCode);
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3454,7 +3698,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalCode_LessEqual(String postalCode, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_EQUAL, postalCode);
+        final Object _value = postalCode;
+        RangeQueryBuilder builder = regRangeQ("postalCode", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3563,8 +3808,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPhysicalDeliveryOfficeName_MatchPhrase(physicalDeliveryOfficeName, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setPhysicalDeliveryOfficeName_MatchPhrase(String physicalDeliveryOfficeName,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3575,8 +3821,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPhysicalDeliveryOfficeName_MatchPhrasePrefix(String physicalDeliveryOfficeName,
-            ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3586,8 +3832,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPhysicalDeliveryOfficeName_Fuzzy(physicalDeliveryOfficeName, null);
     }
 
-    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+    public void setPhysicalDeliveryOfficeName_Fuzzy(String physicalDeliveryOfficeName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3626,12 +3872,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName) {
+        setPhysicalDeliveryOfficeName_SpanTerm("physicalDeliveryOfficeName", null);
+    }
+
+    public void setPhysicalDeliveryOfficeName_SpanTerm(String physicalDeliveryOfficeName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("physicalDeliveryOfficeName", physicalDeliveryOfficeName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName) {
         setPhysicalDeliveryOfficeName_GreaterThan(physicalDeliveryOfficeName, null);
     }
 
     public void setPhysicalDeliveryOfficeName_GreaterThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_THAN, physicalDeliveryOfficeName);
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3642,7 +3900,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPhysicalDeliveryOfficeName_LessThan(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_THAN, physicalDeliveryOfficeName);
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3654,7 +3913,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
 
     public void setPhysicalDeliveryOfficeName_GreaterEqual(String physicalDeliveryOfficeName,
             ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_EQUAL, physicalDeliveryOfficeName);
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3665,7 +3925,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPhysicalDeliveryOfficeName_LessEqual(String physicalDeliveryOfficeName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_EQUAL, physicalDeliveryOfficeName);
+        final Object _value = physicalDeliveryOfficeName;
+        RangeQueryBuilder builder = regRangeQ("physicalDeliveryOfficeName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3773,8 +4034,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDestinationIndicator_MatchPhrase(destinationIndicator, null);
     }
 
-    public void setDestinationIndicator_MatchPhrase(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("destinationIndicator", destinationIndicator);
+    public void setDestinationIndicator_MatchPhrase(String destinationIndicator, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3784,8 +4045,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDestinationIndicator_MatchPhrasePrefix(destinationIndicator, null);
     }
 
-    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("destinationIndicator", destinationIndicator);
+    public void setDestinationIndicator_MatchPhrasePrefix(String destinationIndicator,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3795,8 +4057,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDestinationIndicator_Fuzzy(destinationIndicator, null);
     }
 
-    public void setDestinationIndicator_Fuzzy(String destinationIndicator, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("destinationIndicator", destinationIndicator);
+    public void setDestinationIndicator_Fuzzy(String destinationIndicator, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("destinationIndicator", destinationIndicator);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3835,12 +4097,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDestinationIndicator_SpanTerm(String destinationIndicator) {
+        setDestinationIndicator_SpanTerm("destinationIndicator", null);
+    }
+
+    public void setDestinationIndicator_SpanTerm(String destinationIndicator, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("destinationIndicator", destinationIndicator);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDestinationIndicator_GreaterThan(String destinationIndicator) {
         setDestinationIndicator_GreaterThan(destinationIndicator, null);
     }
 
     public void setDestinationIndicator_GreaterThan(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_THAN, destinationIndicator);
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3851,7 +4125,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDestinationIndicator_LessThan(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_THAN, destinationIndicator);
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3862,7 +4137,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDestinationIndicator_GreaterEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_EQUAL, destinationIndicator);
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3873,7 +4149,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDestinationIndicator_LessEqual(String destinationIndicator, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_EQUAL, destinationIndicator);
+        final Object _value = destinationIndicator;
+        RangeQueryBuilder builder = regRangeQ("destinationIndicator", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3982,8 +4259,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInternationaliSDNNumber_MatchPhrase(internationaliSDNNumber, null);
     }
 
-    public void setInternationaliSDNNumber_MatchPhrase(String internationaliSDNNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("internationaliSDNNumber", internationaliSDNNumber);
+    public void setInternationaliSDNNumber_MatchPhrase(String internationaliSDNNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("internationaliSDNNumber", internationaliSDNNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -3993,8 +4270,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInternationaliSDNNumber_MatchPhrasePrefix(internationaliSDNNumber, null);
     }
 
-    public void setInternationaliSDNNumber_MatchPhrasePrefix(String internationaliSDNNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("internationaliSDNNumber", internationaliSDNNumber);
+    public void setInternationaliSDNNumber_MatchPhrasePrefix(String internationaliSDNNumber,
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("internationaliSDNNumber", internationaliSDNNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4004,8 +4282,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInternationaliSDNNumber_Fuzzy(internationaliSDNNumber, null);
     }
 
-    public void setInternationaliSDNNumber_Fuzzy(String internationaliSDNNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("internationaliSDNNumber", internationaliSDNNumber);
+    public void setInternationaliSDNNumber_Fuzzy(String internationaliSDNNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("internationaliSDNNumber", internationaliSDNNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4044,12 +4322,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setInternationaliSDNNumber_SpanTerm(String internationaliSDNNumber) {
+        setInternationaliSDNNumber_SpanTerm("internationaliSDNNumber", null);
+    }
+
+    public void setInternationaliSDNNumber_SpanTerm(String internationaliSDNNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("internationaliSDNNumber", internationaliSDNNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setInternationaliSDNNumber_GreaterThan(String internationaliSDNNumber) {
         setInternationaliSDNNumber_GreaterThan(internationaliSDNNumber, null);
     }
 
     public void setInternationaliSDNNumber_GreaterThan(String internationaliSDNNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_GREATER_THAN, internationaliSDNNumber);
+        final Object _value = internationaliSDNNumber;
+        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4060,7 +4350,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInternationaliSDNNumber_LessThan(String internationaliSDNNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_LESS_THAN, internationaliSDNNumber);
+        final Object _value = internationaliSDNNumber;
+        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4071,7 +4362,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInternationaliSDNNumber_GreaterEqual(String internationaliSDNNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_GREATER_EQUAL, internationaliSDNNumber);
+        final Object _value = internationaliSDNNumber;
+        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4082,7 +4374,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInternationaliSDNNumber_LessEqual(String internationaliSDNNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_LESS_EQUAL, internationaliSDNNumber);
+        final Object _value = internationaliSDNNumber;
+        RangeQueryBuilder builder = regRangeQ("internationaliSDNNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4189,8 +4482,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setState_MatchPhrase(state, null);
     }
 
-    public void setState_MatchPhrase(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("state", state);
+    public void setState_MatchPhrase(String state, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4200,8 +4493,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setState_MatchPhrasePrefix(state, null);
     }
 
-    public void setState_MatchPhrasePrefix(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("state", state);
+    public void setState_MatchPhrasePrefix(String state, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4211,8 +4504,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setState_Fuzzy(state, null);
     }
 
-    public void setState_Fuzzy(String state, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("state", state);
+    public void setState_Fuzzy(String state, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("state", state);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4251,12 +4544,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setState_SpanTerm(String state) {
+        setState_SpanTerm("state", null);
+    }
+
+    public void setState_SpanTerm(String state, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("state", state);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setState_GreaterThan(String state) {
         setState_GreaterThan(state, null);
     }
 
     public void setState_GreaterThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_THAN, state);
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4267,7 +4572,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setState_LessThan(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_THAN, state);
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4278,7 +4584,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setState_GreaterEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_EQUAL, state);
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4289,7 +4596,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setState_LessEqual(String state, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_EQUAL, state);
+        final Object _value = state;
+        RangeQueryBuilder builder = regRangeQ("state", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4396,8 +4704,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeType_MatchPhrase(employeeType, null);
     }
 
-    public void setEmployeeType_MatchPhrase(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("employeeType", employeeType);
+    public void setEmployeeType_MatchPhrase(String employeeType, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4407,8 +4715,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeType_MatchPhrasePrefix(employeeType, null);
     }
 
-    public void setEmployeeType_MatchPhrasePrefix(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("employeeType", employeeType);
+    public void setEmployeeType_MatchPhrasePrefix(String employeeType, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4418,8 +4726,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setEmployeeType_Fuzzy(employeeType, null);
     }
 
-    public void setEmployeeType_Fuzzy(String employeeType, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("employeeType", employeeType);
+    public void setEmployeeType_Fuzzy(String employeeType, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("employeeType", employeeType);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4458,12 +4766,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setEmployeeType_SpanTerm(String employeeType) {
+        setEmployeeType_SpanTerm("employeeType", null);
+    }
+
+    public void setEmployeeType_SpanTerm(String employeeType, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("employeeType", employeeType);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setEmployeeType_GreaterThan(String employeeType) {
         setEmployeeType_GreaterThan(employeeType, null);
     }
 
     public void setEmployeeType_GreaterThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_THAN, employeeType);
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4474,7 +4794,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeType_LessThan(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_THAN, employeeType);
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4485,7 +4806,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeType_GreaterEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_EQUAL, employeeType);
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4496,7 +4818,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setEmployeeType_LessEqual(String employeeType, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_EQUAL, employeeType);
+        final Object _value = employeeType;
+        RangeQueryBuilder builder = regRangeQ("employeeType", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4605,8 +4928,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setFacsimileTelephoneNumber_MatchPhrase(facsimileTelephoneNumber, null);
     }
 
-    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setFacsimileTelephoneNumber_MatchPhrase(String facsimileTelephoneNumber,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4617,8 +4941,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setFacsimileTelephoneNumber_MatchPhrasePrefix(String facsimileTelephoneNumber,
-            ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4628,8 +4952,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setFacsimileTelephoneNumber_Fuzzy(facsimileTelephoneNumber, null);
     }
 
-    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+    public void setFacsimileTelephoneNumber_Fuzzy(String facsimileTelephoneNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4668,12 +4992,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber) {
+        setFacsimileTelephoneNumber_SpanTerm("facsimileTelephoneNumber", null);
+    }
+
+    public void setFacsimileTelephoneNumber_SpanTerm(String facsimileTelephoneNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("facsimileTelephoneNumber", facsimileTelephoneNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber) {
         setFacsimileTelephoneNumber_GreaterThan(facsimileTelephoneNumber, null);
     }
 
     public void setFacsimileTelephoneNumber_GreaterThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_THAN, facsimileTelephoneNumber);
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4684,7 +5020,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setFacsimileTelephoneNumber_LessThan(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_THAN, facsimileTelephoneNumber);
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4695,7 +5032,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setFacsimileTelephoneNumber_GreaterEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_EQUAL, facsimileTelephoneNumber);
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4706,7 +5044,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setFacsimileTelephoneNumber_LessEqual(String facsimileTelephoneNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_EQUAL, facsimileTelephoneNumber);
+        final Object _value = facsimileTelephoneNumber;
+        RangeQueryBuilder builder = regRangeQ("facsimileTelephoneNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4814,8 +5153,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostOfficeBox_MatchPhrase(postOfficeBox, null);
     }
 
-    public void setPostOfficeBox_MatchPhrase(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("postOfficeBox", postOfficeBox);
+    public void setPostOfficeBox_MatchPhrase(String postOfficeBox, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4825,8 +5164,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostOfficeBox_MatchPhrasePrefix(postOfficeBox, null);
     }
 
-    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("postOfficeBox", postOfficeBox);
+    public void setPostOfficeBox_MatchPhrasePrefix(String postOfficeBox, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4836,8 +5175,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostOfficeBox_Fuzzy(postOfficeBox, null);
     }
 
-    public void setPostOfficeBox_Fuzzy(String postOfficeBox, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("postOfficeBox", postOfficeBox);
+    public void setPostOfficeBox_Fuzzy(String postOfficeBox, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postOfficeBox", postOfficeBox);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4876,12 +5215,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPostOfficeBox_SpanTerm(String postOfficeBox) {
+        setPostOfficeBox_SpanTerm("postOfficeBox", null);
+    }
+
+    public void setPostOfficeBox_SpanTerm(String postOfficeBox, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postOfficeBox", postOfficeBox);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPostOfficeBox_GreaterThan(String postOfficeBox) {
         setPostOfficeBox_GreaterThan(postOfficeBox, null);
     }
 
     public void setPostOfficeBox_GreaterThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_THAN, postOfficeBox);
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4892,7 +5243,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostOfficeBox_LessThan(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_THAN, postOfficeBox);
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4903,7 +5255,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostOfficeBox_GreaterEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_EQUAL, postOfficeBox);
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -4914,7 +5267,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostOfficeBox_LessEqual(String postOfficeBox, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_EQUAL, postOfficeBox);
+        final Object _value = postOfficeBox;
+        RangeQueryBuilder builder = regRangeQ("postOfficeBox", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5021,8 +5375,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInitials_MatchPhrase(initials, null);
     }
 
-    public void setInitials_MatchPhrase(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("initials", initials);
+    public void setInitials_MatchPhrase(String initials, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5032,8 +5386,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInitials_MatchPhrasePrefix(initials, null);
     }
 
-    public void setInitials_MatchPhrasePrefix(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("initials", initials);
+    public void setInitials_MatchPhrasePrefix(String initials, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5043,8 +5397,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setInitials_Fuzzy(initials, null);
     }
 
-    public void setInitials_Fuzzy(String initials, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("initials", initials);
+    public void setInitials_Fuzzy(String initials, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("initials", initials);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5083,12 +5437,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setInitials_SpanTerm(String initials) {
+        setInitials_SpanTerm("initials", null);
+    }
+
+    public void setInitials_SpanTerm(String initials, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("initials", initials);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setInitials_GreaterThan(String initials) {
         setInitials_GreaterThan(initials, null);
     }
 
     public void setInitials_GreaterThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_THAN, initials);
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5099,7 +5465,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInitials_LessThan(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_THAN, initials);
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5110,7 +5477,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInitials_GreaterEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_EQUAL, initials);
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5121,7 +5489,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setInitials_LessEqual(String initials, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_EQUAL, initials);
+        final Object _value = initials;
+        RangeQueryBuilder builder = regRangeQ("initials", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5228,8 +5597,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCarLicense_MatchPhrase(carLicense, null);
     }
 
-    public void setCarLicense_MatchPhrase(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("carLicense", carLicense);
+    public void setCarLicense_MatchPhrase(String carLicense, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5239,8 +5608,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCarLicense_MatchPhrasePrefix(carLicense, null);
     }
 
-    public void setCarLicense_MatchPhrasePrefix(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("carLicense", carLicense);
+    public void setCarLicense_MatchPhrasePrefix(String carLicense, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5250,8 +5619,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCarLicense_Fuzzy(carLicense, null);
     }
 
-    public void setCarLicense_Fuzzy(String carLicense, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("carLicense", carLicense);
+    public void setCarLicense_Fuzzy(String carLicense, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("carLicense", carLicense);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5290,12 +5659,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCarLicense_SpanTerm(String carLicense) {
+        setCarLicense_SpanTerm("carLicense", null);
+    }
+
+    public void setCarLicense_SpanTerm(String carLicense, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("carLicense", carLicense);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCarLicense_GreaterThan(String carLicense) {
         setCarLicense_GreaterThan(carLicense, null);
     }
 
     public void setCarLicense_GreaterThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_THAN, carLicense);
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5306,7 +5687,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCarLicense_LessThan(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_THAN, carLicense);
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5317,7 +5699,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCarLicense_GreaterEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_EQUAL, carLicense);
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5328,7 +5711,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCarLicense_LessEqual(String carLicense, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_EQUAL, carLicense);
+        final Object _value = carLicense;
+        RangeQueryBuilder builder = regRangeQ("carLicense", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5435,8 +5819,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMobile_MatchPhrase(mobile, null);
     }
 
-    public void setMobile_MatchPhrase(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("mobile", mobile);
+    public void setMobile_MatchPhrase(String mobile, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5446,8 +5830,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMobile_MatchPhrasePrefix(mobile, null);
     }
 
-    public void setMobile_MatchPhrasePrefix(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("mobile", mobile);
+    public void setMobile_MatchPhrasePrefix(String mobile, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5457,8 +5841,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setMobile_Fuzzy(mobile, null);
     }
 
-    public void setMobile_Fuzzy(String mobile, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("mobile", mobile);
+    public void setMobile_Fuzzy(String mobile, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("mobile", mobile);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5497,12 +5881,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setMobile_SpanTerm(String mobile) {
+        setMobile_SpanTerm("mobile", null);
+    }
+
+    public void setMobile_SpanTerm(String mobile, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("mobile", mobile);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setMobile_GreaterThan(String mobile) {
         setMobile_GreaterThan(mobile, null);
     }
 
     public void setMobile_GreaterThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_THAN, mobile);
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5513,7 +5909,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMobile_LessThan(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_THAN, mobile);
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5524,7 +5921,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMobile_GreaterEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_EQUAL, mobile);
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5535,7 +5933,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setMobile_LessEqual(String mobile, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_EQUAL, mobile);
+        final Object _value = mobile;
+        RangeQueryBuilder builder = regRangeQ("mobile", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5642,8 +6041,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalAddress_MatchPhrase(postalAddress, null);
     }
 
-    public void setPostalAddress_MatchPhrase(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("postalAddress", postalAddress);
+    public void setPostalAddress_MatchPhrase(String postalAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5653,8 +6052,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalAddress_MatchPhrasePrefix(postalAddress, null);
     }
 
-    public void setPostalAddress_MatchPhrasePrefix(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("postalAddress", postalAddress);
+    public void setPostalAddress_MatchPhrasePrefix(String postalAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5664,8 +6063,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPostalAddress_Fuzzy(postalAddress, null);
     }
 
-    public void setPostalAddress_Fuzzy(String postalAddress, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("postalAddress", postalAddress);
+    public void setPostalAddress_Fuzzy(String postalAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("postalAddress", postalAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5704,12 +6103,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPostalAddress_SpanTerm(String postalAddress) {
+        setPostalAddress_SpanTerm("postalAddress", null);
+    }
+
+    public void setPostalAddress_SpanTerm(String postalAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("postalAddress", postalAddress);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPostalAddress_GreaterThan(String postalAddress) {
         setPostalAddress_GreaterThan(postalAddress, null);
     }
 
     public void setPostalAddress_GreaterThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_THAN, postalAddress);
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5720,7 +6131,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalAddress_LessThan(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_THAN, postalAddress);
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5731,7 +6143,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalAddress_GreaterEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_EQUAL, postalAddress);
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5742,7 +6155,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPostalAddress_LessEqual(String postalAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_EQUAL, postalAddress);
+        final Object _value = postalAddress;
+        RangeQueryBuilder builder = regRangeQ("postalAddress", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5849,8 +6263,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCity_MatchPhrase(city, null);
     }
 
-    public void setCity_MatchPhrase(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("city", city);
+    public void setCity_MatchPhrase(String city, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5860,8 +6274,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCity_MatchPhrasePrefix(city, null);
     }
 
-    public void setCity_MatchPhrasePrefix(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("city", city);
+    public void setCity_MatchPhrasePrefix(String city, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5871,8 +6285,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setCity_Fuzzy(city, null);
     }
 
-    public void setCity_Fuzzy(String city, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("city", city);
+    public void setCity_Fuzzy(String city, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("city", city);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5911,12 +6325,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setCity_SpanTerm(String city) {
+        setCity_SpanTerm("city", null);
+    }
+
+    public void setCity_SpanTerm(String city, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("city", city);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setCity_GreaterThan(String city) {
         setCity_GreaterThan(city, null);
     }
 
     public void setCity_GreaterThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_THAN, city);
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5927,7 +6353,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCity_LessThan(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_THAN, city);
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5938,7 +6365,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCity_GreaterEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_EQUAL, city);
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -5949,7 +6377,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setCity_LessEqual(String city, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_EQUAL, city);
+        final Object _value = city;
+        RangeQueryBuilder builder = regRangeQ("city", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6058,8 +6487,9 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTeletexTerminalIdentifier_MatchPhrase(teletexTerminalIdentifier, null);
     }
 
-    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setTeletexTerminalIdentifier_MatchPhrase(String teletexTerminalIdentifier,
+            ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6070,8 +6500,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTeletexTerminalIdentifier_MatchPhrasePrefix(String teletexTerminalIdentifier,
-            ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+            ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6081,8 +6511,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setTeletexTerminalIdentifier_Fuzzy(teletexTerminalIdentifier, null);
     }
 
-    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+    public void setTeletexTerminalIdentifier_Fuzzy(String teletexTerminalIdentifier, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6121,12 +6551,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier) {
+        setTeletexTerminalIdentifier_SpanTerm("teletexTerminalIdentifier", null);
+    }
+
+    public void setTeletexTerminalIdentifier_SpanTerm(String teletexTerminalIdentifier, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("teletexTerminalIdentifier", teletexTerminalIdentifier);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier) {
         setTeletexTerminalIdentifier_GreaterThan(teletexTerminalIdentifier, null);
     }
 
     public void setTeletexTerminalIdentifier_GreaterThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_THAN, teletexTerminalIdentifier);
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6137,7 +6579,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTeletexTerminalIdentifier_LessThan(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_THAN, teletexTerminalIdentifier);
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6148,7 +6591,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTeletexTerminalIdentifier_GreaterEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_EQUAL, teletexTerminalIdentifier);
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6159,7 +6603,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setTeletexTerminalIdentifier_LessEqual(String teletexTerminalIdentifier, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_EQUAL, teletexTerminalIdentifier);
+        final Object _value = teletexTerminalIdentifier;
+        RangeQueryBuilder builder = regRangeQ("teletexTerminalIdentifier", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6267,8 +6712,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setX121Address_MatchPhrase(x121Address, null);
     }
 
-    public void setX121Address_MatchPhrase(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("x121Address", x121Address);
+    public void setX121Address_MatchPhrase(String x121Address, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6278,8 +6723,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setX121Address_MatchPhrasePrefix(x121Address, null);
     }
 
-    public void setX121Address_MatchPhrasePrefix(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("x121Address", x121Address);
+    public void setX121Address_MatchPhrasePrefix(String x121Address, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6289,8 +6734,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setX121Address_Fuzzy(x121Address, null);
     }
 
-    public void setX121Address_Fuzzy(String x121Address, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("x121Address", x121Address);
+    public void setX121Address_Fuzzy(String x121Address, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("x121Address", x121Address);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6329,12 +6774,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setX121Address_SpanTerm(String x121Address) {
+        setX121Address_SpanTerm("x121Address", null);
+    }
+
+    public void setX121Address_SpanTerm(String x121Address, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("x121Address", x121Address);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setX121Address_GreaterThan(String x121Address) {
         setX121Address_GreaterThan(x121Address, null);
     }
 
     public void setX121Address_GreaterThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_THAN, x121Address);
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6345,7 +6802,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setX121Address_LessThan(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_THAN, x121Address);
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6356,7 +6814,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setX121Address_GreaterEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_EQUAL, x121Address);
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6367,7 +6826,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setX121Address_LessEqual(String x121Address, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_EQUAL, x121Address);
+        final Object _value = x121Address;
+        RangeQueryBuilder builder = regRangeQ("x121Address", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6474,8 +6934,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setBusinessCategory_MatchPhrase(businessCategory, null);
     }
 
-    public void setBusinessCategory_MatchPhrase(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("businessCategory", businessCategory);
+    public void setBusinessCategory_MatchPhrase(String businessCategory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6485,8 +6945,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setBusinessCategory_MatchPhrasePrefix(businessCategory, null);
     }
 
-    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("businessCategory", businessCategory);
+    public void setBusinessCategory_MatchPhrasePrefix(String businessCategory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6496,8 +6956,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setBusinessCategory_Fuzzy(businessCategory, null);
     }
 
-    public void setBusinessCategory_Fuzzy(String businessCategory, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("businessCategory", businessCategory);
+    public void setBusinessCategory_Fuzzy(String businessCategory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("businessCategory", businessCategory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6536,12 +6996,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setBusinessCategory_SpanTerm(String businessCategory) {
+        setBusinessCategory_SpanTerm("businessCategory", null);
+    }
+
+    public void setBusinessCategory_SpanTerm(String businessCategory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("businessCategory", businessCategory);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setBusinessCategory_GreaterThan(String businessCategory) {
         setBusinessCategory_GreaterThan(businessCategory, null);
     }
 
     public void setBusinessCategory_GreaterThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_THAN, businessCategory);
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6552,7 +7024,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setBusinessCategory_LessThan(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_THAN, businessCategory);
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6563,7 +7036,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setBusinessCategory_GreaterEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_EQUAL, businessCategory);
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6574,7 +7048,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setBusinessCategory_LessEqual(String businessCategory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_EQUAL, businessCategory);
+        final Object _value = businessCategory;
+        RangeQueryBuilder builder = regRangeQ("businessCategory", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6681,8 +7156,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRegisteredAddress_MatchPhrase(registeredAddress, null);
     }
 
-    public void setRegisteredAddress_MatchPhrase(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("registeredAddress", registeredAddress);
+    public void setRegisteredAddress_MatchPhrase(String registeredAddress, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6692,8 +7167,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRegisteredAddress_MatchPhrasePrefix(registeredAddress, null);
     }
 
-    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("registeredAddress", registeredAddress);
+    public void setRegisteredAddress_MatchPhrasePrefix(String registeredAddress, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6703,8 +7178,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRegisteredAddress_Fuzzy(registeredAddress, null);
     }
 
-    public void setRegisteredAddress_Fuzzy(String registeredAddress, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("registeredAddress", registeredAddress);
+    public void setRegisteredAddress_Fuzzy(String registeredAddress, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("registeredAddress", registeredAddress);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6743,12 +7218,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRegisteredAddress_SpanTerm(String registeredAddress) {
+        setRegisteredAddress_SpanTerm("registeredAddress", null);
+    }
+
+    public void setRegisteredAddress_SpanTerm(String registeredAddress, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("registeredAddress", registeredAddress);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRegisteredAddress_GreaterThan(String registeredAddress) {
         setRegisteredAddress_GreaterThan(registeredAddress, null);
     }
 
     public void setRegisteredAddress_GreaterThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_THAN, registeredAddress);
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6759,7 +7246,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegisteredAddress_LessThan(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_THAN, registeredAddress);
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6770,7 +7258,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegisteredAddress_GreaterEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_EQUAL, registeredAddress);
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6781,7 +7270,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRegisteredAddress_LessEqual(String registeredAddress, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_EQUAL, registeredAddress);
+        final Object _value = registeredAddress;
+        RangeQueryBuilder builder = regRangeQ("registeredAddress", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6888,8 +7378,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDisplayName_MatchPhrase(displayName, null);
     }
 
-    public void setDisplayName_MatchPhrase(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("displayName", displayName);
+    public void setDisplayName_MatchPhrase(String displayName, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6899,8 +7389,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDisplayName_MatchPhrasePrefix(displayName, null);
     }
 
-    public void setDisplayName_MatchPhrasePrefix(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("displayName", displayName);
+    public void setDisplayName_MatchPhrasePrefix(String displayName, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6910,8 +7400,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDisplayName_Fuzzy(displayName, null);
     }
 
-    public void setDisplayName_Fuzzy(String displayName, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("displayName", displayName);
+    public void setDisplayName_Fuzzy(String displayName, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("displayName", displayName);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6950,12 +7440,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDisplayName_SpanTerm(String displayName) {
+        setDisplayName_SpanTerm("displayName", null);
+    }
+
+    public void setDisplayName_SpanTerm(String displayName, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("displayName", displayName);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDisplayName_GreaterThan(String displayName) {
         setDisplayName_GreaterThan(displayName, null);
     }
 
     public void setDisplayName_GreaterThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_THAN, displayName);
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6966,7 +7468,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDisplayName_LessThan(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_THAN, displayName);
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6977,7 +7480,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDisplayName_GreaterEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_EQUAL, displayName);
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -6988,7 +7492,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDisplayName_LessEqual(String displayName, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_EQUAL, displayName);
+        final Object _value = displayName;
+        RangeQueryBuilder builder = regRangeQ("displayName", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7095,8 +7600,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPreferredLanguage_MatchPhrase(preferredLanguage, null);
     }
 
-    public void setPreferredLanguage_MatchPhrase(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("preferredLanguage", preferredLanguage);
+    public void setPreferredLanguage_MatchPhrase(String preferredLanguage, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7106,8 +7611,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPreferredLanguage_MatchPhrasePrefix(preferredLanguage, null);
     }
 
-    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("preferredLanguage", preferredLanguage);
+    public void setPreferredLanguage_MatchPhrasePrefix(String preferredLanguage, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7117,8 +7622,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setPreferredLanguage_Fuzzy(preferredLanguage, null);
     }
 
-    public void setPreferredLanguage_Fuzzy(String preferredLanguage, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("preferredLanguage", preferredLanguage);
+    public void setPreferredLanguage_Fuzzy(String preferredLanguage, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("preferredLanguage", preferredLanguage);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7157,12 +7662,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setPreferredLanguage_SpanTerm(String preferredLanguage) {
+        setPreferredLanguage_SpanTerm("preferredLanguage", null);
+    }
+
+    public void setPreferredLanguage_SpanTerm(String preferredLanguage, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("preferredLanguage", preferredLanguage);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setPreferredLanguage_GreaterThan(String preferredLanguage) {
         setPreferredLanguage_GreaterThan(preferredLanguage, null);
     }
 
     public void setPreferredLanguage_GreaterThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_THAN, preferredLanguage);
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7173,7 +7690,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPreferredLanguage_LessThan(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_THAN, preferredLanguage);
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7184,7 +7702,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPreferredLanguage_GreaterEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_EQUAL, preferredLanguage);
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7195,7 +7714,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setPreferredLanguage_LessEqual(String preferredLanguage, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_EQUAL, preferredLanguage);
+        final Object _value = preferredLanguage;
+        RangeQueryBuilder builder = regRangeQ("preferredLanguage", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7302,8 +7822,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDepartmentNumber_MatchPhrase(departmentNumber, null);
     }
 
-    public void setDepartmentNumber_MatchPhrase(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("departmentNumber", departmentNumber);
+    public void setDepartmentNumber_MatchPhrase(String departmentNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7313,8 +7833,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDepartmentNumber_MatchPhrasePrefix(departmentNumber, null);
     }
 
-    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("departmentNumber", departmentNumber);
+    public void setDepartmentNumber_MatchPhrasePrefix(String departmentNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7324,8 +7844,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setDepartmentNumber_Fuzzy(departmentNumber, null);
     }
 
-    public void setDepartmentNumber_Fuzzy(String departmentNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("departmentNumber", departmentNumber);
+    public void setDepartmentNumber_Fuzzy(String departmentNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("departmentNumber", departmentNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7364,12 +7884,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setDepartmentNumber_SpanTerm(String departmentNumber) {
+        setDepartmentNumber_SpanTerm("departmentNumber", null);
+    }
+
+    public void setDepartmentNumber_SpanTerm(String departmentNumber, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("departmentNumber", departmentNumber);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setDepartmentNumber_GreaterThan(String departmentNumber) {
         setDepartmentNumber_GreaterThan(departmentNumber, null);
     }
 
     public void setDepartmentNumber_GreaterThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_THAN, departmentNumber);
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7380,7 +7912,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepartmentNumber_LessThan(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_THAN, departmentNumber);
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7391,7 +7924,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepartmentNumber_GreaterEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_EQUAL, departmentNumber);
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7402,7 +7936,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setDepartmentNumber_LessEqual(String departmentNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_EQUAL, departmentNumber);
+        final Object _value = departmentNumber;
+        RangeQueryBuilder builder = regRangeQ("departmentNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7509,8 +8044,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setUidNumber_MatchPhrase(uidNumber, null);
     }
 
-    public void setUidNumber_MatchPhrase(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("uidNumber", uidNumber);
+    public void setUidNumber_MatchPhrase(Long uidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7520,8 +8055,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setUidNumber_MatchPhrasePrefix(uidNumber, null);
     }
 
-    public void setUidNumber_MatchPhrasePrefix(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("uidNumber", uidNumber);
+    public void setUidNumber_MatchPhrasePrefix(Long uidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7531,8 +8066,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setUidNumber_Fuzzy(uidNumber, null);
     }
 
-    public void setUidNumber_Fuzzy(Long uidNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("uidNumber", uidNumber);
+    public void setUidNumber_Fuzzy(Long uidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("uidNumber", uidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7543,7 +8078,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setUidNumber_GreaterThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_THAN, uidNumber);
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7554,7 +8090,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setUidNumber_LessThan(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_THAN, uidNumber);
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7565,7 +8102,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setUidNumber_GreaterEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_EQUAL, uidNumber);
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7576,7 +8114,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setUidNumber_LessEqual(Long uidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_EQUAL, uidNumber);
+        final Object _value = uidNumber;
+        RangeQueryBuilder builder = regRangeQ("uidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7683,8 +8222,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGidNumber_MatchPhrase(gidNumber, null);
     }
 
-    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
+    public void setGidNumber_MatchPhrase(Long gidNumber, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7694,8 +8233,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGidNumber_MatchPhrasePrefix(gidNumber, null);
     }
 
-    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
+    public void setGidNumber_MatchPhrasePrefix(Long gidNumber, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7705,8 +8244,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGidNumber_Fuzzy(gidNumber, null);
     }
 
-    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
+    public void setGidNumber_Fuzzy(Long gidNumber, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("gidNumber", gidNumber);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7717,7 +8256,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_GreaterThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7728,7 +8268,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_LessThan(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7739,7 +8280,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_GreaterEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7750,7 +8292,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGidNumber_LessEqual(Long gidNumber, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, gidNumber);
+        final Object _value = gidNumber;
+        RangeQueryBuilder builder = regRangeQ("gidNumber", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7857,8 +8400,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomeDirectory_MatchPhrase(homeDirectory, null);
     }
 
-    public void setHomeDirectory_MatchPhrase(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("homeDirectory", homeDirectory);
+    public void setHomeDirectory_MatchPhrase(String homeDirectory, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7868,8 +8411,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomeDirectory_MatchPhrasePrefix(homeDirectory, null);
     }
 
-    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("homeDirectory", homeDirectory);
+    public void setHomeDirectory_MatchPhrasePrefix(String homeDirectory, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7879,8 +8422,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setHomeDirectory_Fuzzy(homeDirectory, null);
     }
 
-    public void setHomeDirectory_Fuzzy(String homeDirectory, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("homeDirectory", homeDirectory);
+    public void setHomeDirectory_Fuzzy(String homeDirectory, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("homeDirectory", homeDirectory);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7919,12 +8462,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setHomeDirectory_SpanTerm(String homeDirectory) {
+        setHomeDirectory_SpanTerm("homeDirectory", null);
+    }
+
+    public void setHomeDirectory_SpanTerm(String homeDirectory, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("homeDirectory", homeDirectory);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setHomeDirectory_GreaterThan(String homeDirectory) {
         setHomeDirectory_GreaterThan(homeDirectory, null);
     }
 
     public void setHomeDirectory_GreaterThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_THAN, homeDirectory);
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7935,7 +8490,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomeDirectory_LessThan(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_THAN, homeDirectory);
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7946,7 +8502,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomeDirectory_GreaterEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_EQUAL, homeDirectory);
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -7957,7 +8514,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setHomeDirectory_LessEqual(String homeDirectory, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_EQUAL, homeDirectory);
+        final Object _value = homeDirectory;
+        RangeQueryBuilder builder = regRangeQ("homeDirectory", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8064,8 +8622,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGroups_MatchPhrase(groups, null);
     }
 
-    public void setGroups_MatchPhrase(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("groups", groups);
+    public void setGroups_MatchPhrase(String groups, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8075,8 +8633,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGroups_MatchPhrasePrefix(groups, null);
     }
 
-    public void setGroups_MatchPhrasePrefix(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("groups", groups);
+    public void setGroups_MatchPhrasePrefix(String groups, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8086,8 +8644,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setGroups_Fuzzy(groups, null);
     }
 
-    public void setGroups_Fuzzy(String groups, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("groups", groups);
+    public void setGroups_Fuzzy(String groups, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("groups", groups);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8126,12 +8684,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setGroups_SpanTerm(String groups) {
+        setGroups_SpanTerm("groups", null);
+    }
+
+    public void setGroups_SpanTerm(String groups, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("groups", groups);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setGroups_GreaterThan(String groups) {
         setGroups_GreaterThan(groups, null);
     }
 
     public void setGroups_GreaterThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_THAN, groups);
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8142,7 +8712,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGroups_LessThan(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_THAN, groups);
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8153,7 +8724,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGroups_GreaterEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_EQUAL, groups);
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8164,7 +8736,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setGroups_LessEqual(String groups, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_EQUAL, groups);
+        final Object _value = groups;
+        RangeQueryBuilder builder = regRangeQ("groups", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8271,8 +8844,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoles_MatchPhrase(roles, null);
     }
 
-    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhraseQ("roles", roles);
+    public void setRoles_MatchPhrase(String roles, ConditionOptionCall<MatchPhraseQueryBuilder> opLambda) {
+        MatchPhraseQueryBuilder builder = regMatchPhraseQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8282,8 +8855,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoles_MatchPhrasePrefix(roles, null);
     }
 
-    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
-        MatchQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
+    public void setRoles_MatchPhrasePrefix(String roles, ConditionOptionCall<MatchPhrasePrefixQueryBuilder> opLambda) {
+        MatchPhrasePrefixQueryBuilder builder = regMatchPhrasePrefixQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8293,8 +8866,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         setRoles_Fuzzy(roles, null);
     }
 
-    public void setRoles_Fuzzy(String roles, ConditionOptionCall<FuzzyQueryBuilder> opLambda) {
-        FuzzyQueryBuilder builder = regFuzzyQ("roles", roles);
+    public void setRoles_Fuzzy(String roles, ConditionOptionCall<MatchQueryBuilder> opLambda) {
+        MatchQueryBuilder builder = regFuzzyQ("roles", roles);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8333,12 +8906,24 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
         }
     }
 
+    public void setRoles_SpanTerm(String roles) {
+        setRoles_SpanTerm("roles", null);
+    }
+
+    public void setRoles_SpanTerm(String roles, ConditionOptionCall<SpanTermQueryBuilder> opLambda) {
+        SpanTermQueryBuilder builder = regSpanTermQ("roles", roles);
+        if (opLambda != null) {
+            opLambda.callback(builder);
+        }
+    }
+
     public void setRoles_GreaterThan(String roles) {
         setRoles_GreaterThan(roles, null);
     }
 
     public void setRoles_GreaterThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8349,7 +8934,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_LessThan(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_THAN, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8360,7 +8946,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_GreaterEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_GREATER_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
@@ -8371,7 +8958,8 @@ public abstract class BsUserCQ extends EsAbstractConditionQuery {
     }
 
     public void setRoles_LessEqual(String roles, ConditionOptionCall<RangeQueryBuilder> opLambda) {
-        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, roles);
+        final Object _value = roles;
+        RangeQueryBuilder builder = regRangeQ("roles", ConditionKey.CK_LESS_EQUAL, _value);
         if (opLambda != null) {
             opLambda.callback(builder);
         }
diff --git a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
index 04b03445ce6cd02bb065cd09a7af0070cbb650a2..94d4cfb4c6ee13b8118c9e7aecfd397b24a349dc 100644
--- a/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/CrawlingInfoHelper.java
@@ -39,7 +39,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms.Bucket;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms.Order;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,7 +165,7 @@ public class CrawlingInfoHelper {
                 fessConfig.getIndexDocumentType(),
                 queryRequestBuilder -> {
                     queryRequestBuilder.setQuery(QueryBuilders.matchAllQuery());
-                    final TermsBuilder termsBuilder =
+                    final TermsAggregationBuilder termsBuilder =
                             AggregationBuilders.terms(fessConfig.getIndexFieldSegment()).field(fessConfig.getIndexFieldSegment())
                                     .size(maxSessionIdsInList).order(Order.term(false));
                     queryRequestBuilder.addAggregation(termsBuilder);
diff --git a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
index 4d6efb97ad5b9e0be494ca82d9a678baabc77314..9c122cc4172371045512d7a2c5b3c695565aacdd 100644
--- a/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/DataIndexHelper.java
@@ -259,8 +259,8 @@ public class DataIndexHelper {
                     QueryBuilders
                             .boolQuery()
                             .must(QueryBuilders.termQuery(fessConfig.getIndexFieldConfigId(), dataConfig.getConfigId()))
-                            .must(QueryBuilders.boolQuery().should(QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).lte("now"))
-                                    .should(QueryBuilders.missingQuery(fessConfig.getIndexFieldExpires())))
+                            .must(QueryBuilders.boolQuery().mustNot(QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).gt("now"))
+                                    .mustNot(QueryBuilders.existsQuery(fessConfig.getIndexFieldExpires())))
                             .mustNot(QueryBuilders.termQuery(fessConfig.getIndexFieldSegment(), sessionId));
             try {
                 final FessEsClient fessEsClient = ComponentUtil.getFessEsClient();
diff --git a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
index 21f9481a8442705e9020c2c483a7d9f553adf804..767b60639e0573d860181590c85d54c227b6b71d 100644
--- a/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/IndexingHelper.java
@@ -25,7 +25,7 @@ import org.codelibs.fess.thumbnail.ThumbnailManager;
 import org.codelibs.fess.util.ComponentUtil;
 import org.codelibs.fess.util.DocList;
 import org.codelibs.fess.util.MemoryUtil;
-import org.elasticsearch.action.count.CountResponse;
+import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.slf4j.Logger;
@@ -111,7 +111,7 @@ public class IndexingHelper {
         }
         if (!docIdList.isEmpty()) {
             fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(),
-                    QueryBuilders.idsQuery(fessConfig.getIndexDocumentType()).ids(docIdList.stream().toArray(n -> new String[n])));
+                    QueryBuilders.idsQuery(fessConfig.getIndexDocumentType()).addIds(docIdList.stream().toArray(n -> new String[n])));
 
         }
     }
@@ -130,7 +130,7 @@ public class IndexingHelper {
     public int deleteDocumentsByDocId(final FessEsClient fessEsClient, final List<String> docIdList) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
         return fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), QueryBuilders
-                .idsQuery(fessConfig.getIndexDocumentType()).ids(docIdList.stream().toArray(n -> new String[n])));
+                .idsQuery(fessConfig.getIndexDocumentType()).addIds(docIdList.stream().toArray(n -> new String[n])));
     }
 
     public Map<String, Object> getDocument(final FessEsClient fessEsClient, final String id, final String[] fields) {
@@ -163,17 +163,17 @@ public class IndexingHelper {
             final String[] fields) {
         final FessConfig fessConfig = ComponentUtil.getFessConfig();
 
-        final CountResponse countResponse =
-                fessEsClient.prepareCount(fessConfig.getIndexDocumentSearchIndex()).setTypes(fessConfig.getIndexDocumentType())
-                        .setQuery(queryBuilder).execute().actionGet(fessConfig.getIndexSearchTimeout());
-        final long numFound = countResponse.getCount();
+        final SearchResponse countResponse =
+                fessEsClient.prepareSearch(fessConfig.getIndexDocumentSearchIndex()).setTypes(fessConfig.getIndexDocumentType())
+                        .setQuery(queryBuilder).setSize(0).execute().actionGet(fessConfig.getIndexSearchTimeout());
+        final long numFound = countResponse.getHits().getTotalHits();
         // TODO max threshold
 
         return fessEsClient.getDocumentList(fessConfig.getIndexDocumentSearchIndex(), fessConfig.getIndexDocumentType(),
                 requestBuilder -> {
                     requestBuilder.setQuery(queryBuilder).setSize((int) numFound);
                     if (fields != null) {
-                        requestBuilder.addFields(fields);
+                        requestBuilder.setFetchSource(fields, null);
                     }
                     return true;
                 });
diff --git a/src/main/java/org/codelibs/fess/helper/JobHelper.java b/src/main/java/org/codelibs/fess/helper/JobHelper.java
index cd74114df799f1a558f23114f1edc2f5729b96a7..006a4c73a37db94a8d193b90107338df2e58d0fe 100644
--- a/src/main/java/org/codelibs/fess/helper/JobHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/JobHelper.java
@@ -132,7 +132,7 @@ public class JobHelper {
 
     public void store(final JobLog jobLog) {
         ComponentUtil.getComponent(JobLogBhv.class).insertOrUpdate(jobLog, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
     }
 
@@ -161,7 +161,7 @@ public class JobHelper {
                     logger.debug("Update " + jobLog);
                 }
                 ComponentUtil.getComponent(JobLogBhv.class).insertOrUpdate(jobLog, op -> {
-                    op.setRefresh(true);
+                    op.setRefreshPolicy(Constants.TRUE);
                 });
             }
         }
diff --git a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
index 491af6f73e8a4f2212921eebc91ba7d011836c1c..50a7545f576807904900a4aef066ea21d9faab4d 100644
--- a/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/KeyMatchHelper.java
@@ -36,7 +36,7 @@ import org.codelibs.fess.util.DocumentUtil;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
 import org.slf4j.Logger;
@@ -115,11 +115,11 @@ public class KeyMatchHelper {
         this.reloadInterval = reloadInterval;
     }
 
-    public void buildQuery(final List<String> keywordList, final FunctionScoreQueryBuilder functionScoreQuery) {
+    public void buildQuery(final List<String> keywordList, final List<FilterFunctionBuilder> list) {
         keywordList.stream().forEach(keyword -> {
             final Pair<QueryBuilder, ScoreFunctionBuilder> pair = keyMatchQueryMap.get(toLowerCase(keyword));
             if (pair != null) {
-                functionScoreQuery.add(pair.getFirst(), pair.getSecond());
+                list.add(new FilterFunctionBuilder(pair.getFirst(), pair.getSecond()));
             }
         });
     }
diff --git a/src/main/java/org/codelibs/fess/helper/QueryHelper.java b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
index ad02e54b8bd8da70258db5282f9b07bc8b6ad355..315326774fbcdf1eb2c6b9a576df3dd3289fa866 100644
--- a/src/main/java/org/codelibs/fess/helper/QueryHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/QueryHelper.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
@@ -31,7 +30,6 @@ import java.util.stream.Stream;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 import org.apache.lucene.index.Term;
 import org.apache.lucene.queryparser.classic.ParseException;
@@ -63,6 +61,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.index.query.RangeQueryBuilder;
+import org.elasticsearch.index.query.functionscore.FunctionScoreQueryBuilder.FilterFunctionBuilder;
 import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
@@ -110,20 +109,12 @@ public class QueryHelper {
 
     protected String[] sortFields;
 
-    @Deprecated
-    public int highlightFragmentSize = 100;
-
     protected String additionalQuery;
 
     protected boolean lowercaseWildcard = true;
 
     protected long timeAllowed = -1;
 
-    protected Map<String, String[]> requestParameterMap = new HashMap<>();
-
-    @Deprecated
-    public int maxSearchResultOffset = 100000;
-
     protected SortBuilder[] defaultSortBuilders;
 
     protected String highlightPrefix = "hl_";
@@ -132,8 +123,6 @@ public class QueryHelper {
 
     protected GeoInfo defaultGeoInfo;
 
-    protected Map<String, String[]> queryRequestHeaderMap = new HashMap<>();
-
     protected Map<String, String> fieldBoostMap = new HashMap<>();
 
     @PostConstruct
@@ -321,10 +310,10 @@ public class QueryHelper {
     }
 
     protected void buildBoostQuery(final QueryContext queryContext) {
-        queryContext.addFunctionScore(functionScoreQuery -> {
-            functionScoreQuery.add(ScoreFunctionBuilders.fieldValueFactorFunction(fessConfig.getIndexFieldBoost()));
+        queryContext.addFunctionScore(list -> {
+            list.add(new FilterFunctionBuilder(ScoreFunctionBuilders.fieldValueFactorFunction(fessConfig.getIndexFieldBoost())));
             if (keyMatchHelper != null) {
-                keyMatchHelper.buildQuery(queryContext.getDefaultKeyword(), functionScoreQuery);
+                keyMatchHelper.buildQuery(queryContext.getDefaultKeyword(), list);
             }
         });
     }
@@ -774,20 +763,6 @@ public class QueryHelper {
         this.timeAllowed = timeAllowed;
     }
 
-    public void addRequestParameter(final String name, final String... values) {
-        requestParameterMap.put(name, values);
-    }
-
-    public void addRequestParameter(final String name, final String value) {
-        if (value != null) {
-            requestParameterMap.put(name, new String[] { value });
-        }
-    }
-
-    public Set<Entry<String, String[]>> getRequestParameterSet() {
-        return requestParameterMap.entrySet();
-    }
-
     public void addDefaultSort(final String fieldName, final String order) {
         final List<SortBuilder> list = new ArrayList<>();
         if (defaultSortBuilders != null) {
@@ -822,39 +797,6 @@ public class QueryHelper {
         this.defaultGeoInfo = defaultGeoInfo;
     }
 
-    public Map<String, String[]> getQueryRequestHeaderMap() {
-        if (queryRequestHeaderMap.isEmpty()) {
-            return queryRequestHeaderMap;
-        }
-
-        final HttpServletRequest request = LaRequestUtil.getOptionalRequest().orElse(null);
-        final Map<String, String[]> queryParamMap = new HashMap<>();
-        for (final Map.Entry<String, String[]> entry : queryRequestHeaderMap.entrySet()) {
-            final String[] values = entry.getValue();
-            final String[] newValues = new String[values.length];
-            for (int i = 0; i < values.length; i++) {
-                final String value = values[i];
-                if (value.length() > 1 && value.charAt(0) == '$' && request != null) {
-                    final String param = request.getParameter(value.substring(1));
-                    if (StringUtil.isNotBlank(param)) {
-                        newValues[i] = param;
-                    } else {
-                        newValues[i] = StringUtil.EMPTY;
-                    }
-                } else {
-                    newValues[i] = value;
-                }
-            }
-            queryParamMap.put(entry.getKey(), newValues);
-        }
-
-        return queryParamMap;
-    }
-
-    public void addQueryRequestHeader(final String key, final String[] values) {
-        queryRequestHeaderMap.put(key, values);
-    }
-
     public String generateId() {
         return UUID.randomUUID().toString().replace("-", StringUtil.EMPTY);
     }
diff --git a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
index 0e730fe0ee5053de9b3a9517b3fe36ff3916c918..c2b21d7f7672bcfbe956ede5e9b6213d79d6a5d2 100644
--- a/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
+++ b/src/main/java/org/codelibs/fess/helper/SearchLogHelper.java
@@ -259,7 +259,7 @@ public class SearchLogHelper {
         final SearchLogBhv searchLogBhv = ComponentUtil.getComponent(SearchLogBhv.class);
         final SearchFieldLogBhv searchFieldLogBhv = ComponentUtil.getComponent(SearchFieldLogBhv.class);
         searchLogBhv.batchUpdate(searchLogList, op -> {
-            op.setRefresh(true);
+            op.setRefreshPolicy(Constants.TRUE);
         });
         searchLogList.stream().forEach(searchLog -> {
             final List<SearchFieldLog> fieldLogList = new ArrayList<>();
diff --git a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
index a55feb74bc170dec3ca1c0912ab7ba94e82a4ace..c0abe7a3b619d89d3f8d1e0fd84b1970e71fe38a 100644
--- a/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
+++ b/src/main/java/org/codelibs/fess/job/PurgeDocJob.java
@@ -15,8 +15,6 @@
  */
 package org.codelibs.fess.job;
 
-import java.util.Date;
-
 import org.codelibs.fess.es.client.FessEsClient;
 import org.codelibs.fess.mylasta.direction.FessConfig;
 import org.codelibs.fess.util.ComponentUtil;
@@ -36,7 +34,7 @@ public class PurgeDocJob {
         final StringBuilder resultBuf = new StringBuilder();
 
         // clean up
-        final QueryBuilder queryBuilder = QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).to(new Date());
+        final QueryBuilder queryBuilder = QueryBuilders.rangeQuery(fessConfig.getIndexFieldExpires()).to("now");
         try {
             fessEsClient.deleteByQuery(fessConfig.getIndexDocumentUpdateIndex(), fessConfig.getIndexDocumentType(), queryBuilder);
 
diff --git a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
index b8f84b022179c694be19b4f582e4dd79c8e2992c..14ce2f50229a9e8c01210623af0cb90401780696 100644
--- a/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
+++ b/src/main/java/org/codelibs/fess/mylasta/direction/FessConfig.java
@@ -148,7 +148,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
     /** The key of the configuration. e.g. false */
     String CRAWLER_DOCUMENT_DUPLICATE_TERM_REMOVED = "crawler.document.duplicate.term.removed";
 
-    /** The key of the configuration. e.g. u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu202Fu205Fu3000uFEFFuFFFDu00B6 */
+    /** The key of the configuration. e.g. u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu200Cu202Fu205Fu3000uFEFFuFFFDu00B6 */
     String CRAWLER_DOCUMENT_SPACE_CHARS = "crawler.document.space.chars";
 
     /** The key of the configuration. e.g. UTF-8 */
@@ -1428,7 +1428,7 @@ public interface FessConfig extends FessEnv, org.codelibs.fess.mylasta.direction
 
     /**
      * Get the value for the key 'crawler.document.space.chars'. <br>
-     * The value is, e.g. u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu202Fu205Fu3000uFEFFuFFFDu00B6 <br>
+     * The value is, e.g. u0009u000Au000Bu000Cu000Du001Cu001Du001Eu001Fu0020u00A0u1680u180Eu2000u2001u2002u2003u2004u2005u2006u2007u2008u2009u200Au200Bu200Cu202Fu205Fu3000uFEFFuFFFDu00B6 <br>
      * @return The value of found property. (NotNull: if not found, exception but basically no way)
      */
     String getCrawlerDocumentSpaceChars();
diff --git a/src/main/java/org/codelibs/fess/util/QueryResponseList.java b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
index 4d4ef47757a06df227143e43dc7330ecc651b700..9081356bdad3e818be6a9e215cd247d5897ae5c9 100644
--- a/src/main/java/org/codelibs/fess/util/QueryResponseList.java
+++ b/src/main/java/org/codelibs/fess/util/QueryResponseList.java
@@ -33,7 +33,7 @@ import org.elasticsearch.common.text.Text;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.highlight.HighlightField;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/resources/esclient.xml b/src/main/resources/esclient.xml
index e2f25c9ebd52768258593a200fc97c8c855e5cf4..e183cc90e244a1b194676063ca146d5a292074ac 100644
--- a/src/main/resources/esclient.xml
+++ b/src/main/resources/esclient.xml
@@ -6,8 +6,7 @@
 		<property name="settings">
 			{"http.cors.enabled":"true",
 			 "http.cors.allow-origin":"*",
-			 "script.engine.groovy.inline.update":"on",
-			  "index.number_of_replicas":"0"}
+			 "script.engine.groovy.inline.update":"on"}
 		</property>
 		<!-- Dictionaries -->
 		<postConstruct name="addConfigFile">
diff --git a/src/main/resources/fess_indices/.fess_user.json b/src/main/resources/fess_indices/.fess_user.json
index 7bc5f92a26b76d5834f7c6cf479fb831444c1847..095b0fe6a41750050f28bad529c6dcfe0adc4f67 100644
--- a/src/main/resources/fess_indices/.fess_user.json
+++ b/src/main/resources/fess_indices/.fess_user.json
@@ -4,18 +4,6 @@
       "refresh_interval": "1s",
       "number_of_shards": 5,
       "number_of_replicas": 0
-    },
-    "dbflute": {
-      "user": {
-        "properties": {
-          "groups": {
-            "array": true
-          },
-          "roles": {
-            "array": true
-          }
-        }
-      }
     }
   }
 }
diff --git a/src/main/resources/fess_indices/fess/doc.json b/src/main/resources/fess_indices/fess/doc.json
index f3574d11f96c36812902c9f74f5f687b732f9eba..b09349a55080d83facf1b0e982c11a37af1f8918 100644
--- a/src/main/resources/fess_indices/fess/doc.json
+++ b/src/main/resources/fess_indices/fess/doc.json
@@ -11,7 +11,7 @@
         "lang_ar": {
           "match": "*_ar",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "arabic_analyzer"
           }
         }
@@ -20,7 +20,7 @@
         "lang_bg": {
           "match": "*_bg",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "bulgarian_analyzer"
           }
         }
@@ -29,7 +29,7 @@
         "lang_bn": {
           "match": "*_bn",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -38,7 +38,7 @@
         "lang_ca": {
           "match": "*_ca",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "catalan_analyzer"
           }
         }
@@ -47,7 +47,7 @@
         "lang_cs": {
           "match": "*_cs",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "czech_analyzer"
           }
         }
@@ -56,7 +56,7 @@
         "lang_da": {
           "match": "*_da",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "danish_analyzer"
           }
         }
@@ -65,7 +65,7 @@
         "lang_de": {
           "match": "*_de",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "german_analyzer"
           }
         }
@@ -74,7 +74,7 @@
         "lang_el": {
           "match": "*_el",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "greek_analyzer"
           }
         }
@@ -83,7 +83,7 @@
         "lang_en": {
           "match": "*_en",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "english_analyzer"
           }
         }
@@ -92,7 +92,7 @@
         "lang_es": {
           "match": "*_es",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "spanish_analyzer"
           }
         }
@@ -101,7 +101,7 @@
         "lang_et": {
           "match": "*_et",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -110,7 +110,7 @@
         "lang_fa": {
           "match": "*_fa",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "persian_analyzer"
           }
         }
@@ -119,7 +119,7 @@
         "lang_fi": {
           "match": "*_fi",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "finnish_analyzer"
           }
         }
@@ -128,7 +128,7 @@
         "lang_fr": {
           "match": "*_fr",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "french_analyzer"
           }
         }
@@ -137,7 +137,7 @@
         "lang_gu": {
           "match": "*_gu",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -146,7 +146,7 @@
         "lang_he": {
           "match": "*_he",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -155,7 +155,7 @@
         "lang_hi": {
           "match": "*_hi",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -164,7 +164,7 @@
         "lang_hr": {
           "match": "*_hr",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -173,7 +173,7 @@
         "lang_hu": {
           "match": "*_hu",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "hungarian_analyzer"
           }
         }
@@ -182,7 +182,7 @@
         "lang_id": {
           "match": "*_id",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "indonesian_analyzer"
           }
         }
@@ -191,7 +191,7 @@
         "lang_it": {
           "match": "*_it",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "italian_analyzer"
           }
         }
@@ -200,7 +200,7 @@
         "lang_ja": {
           "match": "*_ja",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "japanese_analyzer"
           }
         }
@@ -209,7 +209,7 @@
         "lang_ko": {
           "match": "*_ko",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "korean_analyzer"
           }
         }
@@ -218,7 +218,7 @@
         "lang_lt": {
           "match": "*_lt",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "lithuanian_analyzer"
           }
         }
@@ -227,7 +227,7 @@
         "lang_lv": {
           "match": "*_lv",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "latvian_analyzer"
           }
         }
@@ -236,7 +236,7 @@
         "lang_mk": {
           "match": "*_mk",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -245,7 +245,7 @@
         "lang_ml": {
           "match": "*_ml",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -254,7 +254,7 @@
         "lang_nl": {
           "match": "*_nl",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "dutch_analyzer"
           }
         }
@@ -263,7 +263,7 @@
         "lang_no": {
           "match": "*_no",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "norwegian_analyzer"
           }
         }
@@ -272,7 +272,7 @@
         "lang_pa": {
           "match": "*_pa",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -281,7 +281,7 @@
         "lang_pl": {
           "match": "*_pl",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -290,7 +290,7 @@
         "lang_pt": {
           "match": "*_pt",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "portuguese_analyzer"
           }
         }
@@ -299,7 +299,7 @@
         "lang_ro": {
           "match": "*_ro",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "romanian_analyzer"
           }
         }
@@ -308,7 +308,7 @@
         "lang_ru": {
           "match": "*_ru",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "russian_analyzer"
           }
         }
@@ -317,7 +317,7 @@
         "lang_si": {
           "match": "*_si",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -326,7 +326,7 @@
         "lang_sq": {
           "match": "*_sq",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -335,7 +335,7 @@
         "lang_sv": {
           "match": "*_sv",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "swedish_analyzer"
           }
         }
@@ -344,7 +344,7 @@
         "lang_ta": {
           "match": "*_ta",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -353,7 +353,7 @@
         "lang_te": {
           "match": "*_te",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -362,7 +362,7 @@
         "lang_th": {
           "match": "*_th",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "thai_analyzer"
           }
         }
@@ -371,7 +371,7 @@
         "lang_tl": {
           "match": "*_tl",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -380,7 +380,7 @@
         "lang_tr": {
           "match": "*_tr",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "turkish_analyzer"
           }
         }
@@ -389,7 +389,7 @@
         "lang_uk": {
           "match": "*_uk",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -398,7 +398,7 @@
         "lang_ur": {
           "match": "*_ur",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -407,7 +407,7 @@
         "lang_vi": {
           "match": "*_vi",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -416,7 +416,7 @@
         "lang_zh-cn": {
           "match": "*_zh-cn",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -425,7 +425,7 @@
         "lang_zh-tw": {
           "match": "*_zh-tw",
           "mapping": {
-            "type": "string",
+            "type": "text",
             "analyzer": "empty_analyzer"
           }
         }
@@ -433,8 +433,7 @@
     ],
     "properties": {
       "anchor": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "boost": {
         "type": "float"
@@ -443,8 +442,7 @@
         "type": "long"
       },
       "config_id": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "important_content": {
         "type": "langstring",
@@ -474,30 +472,26 @@
         "format": "date_optional_time"
       },
       "digest": {
-        "type": "string"
+        "type": "text",
+        "index": "no"
       },
       "doc_id": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "favorite_count": {
         "type": "long"
       },
       "filename": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "filetype": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "host": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "lang": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "last_modified": {
         "type": "date",
@@ -507,28 +501,22 @@
         "type": "geo_point"
       },
       "mimetype": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "parent_id": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "role": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "label": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "segment": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "site": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "title": {
         "type": "langstring",
@@ -537,8 +525,7 @@
         "term_vector": "with_positions_offsets"
       },
       "url": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       }
     }
   }
diff --git a/src/main/resources/fess_indices/fess_log.json b/src/main/resources/fess_indices/fess_log.json
index b03f748efc640122d221f473fd7f3525096d7b36..e3657f0d6d2e2e1f9e41ee68441db9b7ab41ff36 100644
--- a/src/main/resources/fess_indices/fess_log.json
+++ b/src/main/resources/fess_indices/fess_log.json
@@ -4,15 +4,6 @@
       "refresh_interval": "1s",
       "number_of_shards": 10,
       "number_of_replicas": 0
-    },
-    "dbflute": {
-      "search_log": {
-        "properties": {
-          "roles": {
-            "array": true
-          }
-        }
-      }
     }
   }
 }
diff --git a/src/main/resources/fess_indices/fess_log/click_log.json b/src/main/resources/fess_indices/fess_log/click_log.json
index 5fb980620143c7eac7f38cd3368de13c682ddf0e..3d9a01f5ef9200c10febb0dfba99603b0bc67735 100644
--- a/src/main/resources/fess_indices/fess_log/click_log.json
+++ b/src/main/resources/fess_indices/fess_log/click_log.json
@@ -8,20 +8,16 @@
     },
     "properties": {
       "docId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "queryId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "userSessionId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "url": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "order": {
         "type": "integer"
diff --git a/src/main/resources/fess_indices/fess_log/favorite_log.json b/src/main/resources/fess_indices/fess_log/favorite_log.json
index 357dd9fe7f05ba43aa693ee50a115801087fa865..81f4b849358e1468288894a9096392b8b7c832e0 100644
--- a/src/main/resources/fess_indices/fess_log/favorite_log.json
+++ b/src/main/resources/fess_indices/fess_log/favorite_log.json
@@ -8,20 +8,16 @@
     },
     "properties": {
       "userInfoId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "url": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "docId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "queryId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "createdAt": {
         "type": "date",
diff --git a/src/main/resources/fess_indices/fess_log/search_field_log.json b/src/main/resources/fess_indices/fess_log/search_field_log.json
index 8d7bbe0e77fe4678d62247b80547861a68e44a94..893bc082ddaeb1c8d28fe67e1168e6384ac10c4c 100644
--- a/src/main/resources/fess_indices/fess_log/search_field_log.json
+++ b/src/main/resources/fess_indices/fess_log/search_field_log.json
@@ -8,16 +8,13 @@
     },
     "properties": {
       "searchLogId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "name": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "value": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       }
     }
   }
diff --git a/src/main/resources/fess_indices/fess_log/search_log.json b/src/main/resources/fess_indices/fess_log/search_log.json
index b5565396f072e16854046d3b16122f7bb1dae8c8..aff5d691ab7cd8af1c625834a02412abdd20592e 100644
--- a/src/main/resources/fess_indices/fess_log/search_log.json
+++ b/src/main/resources/fess_indices/fess_log/search_log.json
@@ -8,20 +8,16 @@
     },
     "properties": {
       "user": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "roles": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "queryId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "searchWord": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "requestedAt": {
         "type": "date",
@@ -43,28 +39,22 @@
         "type": "integer"
       },
       "userAgent": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "referer": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "clientIp": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "userSessionId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "accessType": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "userInfoId": {
-        "type": "string",
-        "index": "not_analyzed"
+        "type": "keyword"
       },
       "languages" : {
         "type" : "string",
diff --git a/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java b/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java
index 928f43d2d2927b86867f0184b1240c7eccb63dbc..a87fb383f7b75b67e0a94920573b2af69be9fcfa 100644
--- a/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java
+++ b/src/test/java/org/codelibs/fess/entity/GeoInfoTest.java
@@ -26,7 +26,8 @@ public class GeoInfoTest extends UnitFessTestCase {
         request.setParameter("geo.location.distance", "10km");
 
         final GeoInfo geoInfo = new GeoInfo(request);
-        String result = "{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":\"10km\"}}";
+        String result =
+                "{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":10000.0,\"distance_type\":\"sloppy_arc\",\"validation_method\":\"STRICT\",\"ignore_unmapped\":false,\"boost\":1.0}}";
         assertEquals(result, geoInfo.toQueryBuilder().toString().replaceAll("[ \n]", ""));
     }
 
@@ -36,7 +37,8 @@ public class GeoInfoTest extends UnitFessTestCase {
         request.setParameter("geo.location.x.distance", "10km");
 
         final GeoInfo geoInfo = new GeoInfo(request);
-        String result = "{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":\"10km\"}}";
+        String result =
+                "{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":10000.0,\"distance_type\":\"sloppy_arc\",\"validation_method\":\"STRICT\",\"ignore_unmapped\":false,\"boost\":1.0}}";
         assertEquals(result, geoInfo.toQueryBuilder().toString().replaceAll("[ \n]", ""));
     }
 
@@ -49,7 +51,7 @@ public class GeoInfoTest extends UnitFessTestCase {
 
         final GeoInfo geoInfo = new GeoInfo(request);
         String result =
-                "{\"bool\":{\"should\":[{\"geo_distance\":{\"location\":[151.0,35.0],\"distance\":\"1km\"}},{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":\"10km\"}}]}}";
+                "{\"bool\":{\"should\":[{\"geo_distance\":{\"location\":[151.0,35.0],\"distance\":1000.0,\"distance_type\":\"sloppy_arc\",\"validation_method\":\"STRICT\",\"ignore_unmapped\":false,\"boost\":1.0}},{\"geo_distance\":{\"location\":[150.0,34.0],\"distance\":10000.0,\"distance_type\":\"sloppy_arc\",\"validation_method\":\"STRICT\",\"ignore_unmapped\":false,\"boost\":1.0}}],\"disable_coord\":false,\"adjust_pure_negative\":true,\"boost\":1.0}}";
         assertEquals(result, geoInfo.toQueryBuilder().toString().replaceAll("[ \n]", ""));
     }
 
diff --git a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
index bbddee110d408255a83d3f40f400eeb4aa4a1291..df7676514d343c84fc5ab09bb49d5be63fb2f0f2 100644
--- a/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
+++ b/src/test/java/org/codelibs/fess/helper/QueryHelperTest.java
@@ -93,7 +93,7 @@ public class QueryHelperTest extends UnitFessTestCase {
     }
 
     private QueryBuilder functionScoreQuery(QueryBuilder queryBuilder) {
-        return QueryBuilders.functionScoreQuery(queryBuilder).add(ScoreFunctionBuilders.fieldValueFactorFunction("boost"));
+        return QueryBuilders.functionScoreQuery(queryBuilder, ScoreFunctionBuilders.fieldValueFactorFunction("boost"));
     }
 
     private void assertQuery(QueryBuilder query1, QueryBuilder query2) {